diff --git a/manifest.json b/manifest.json
index 633767c..43e1654 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "PawHash",
   "version": "0.6",
-  "manifest_version": 2,
+  "manifest_version": 3,
   "description": "Securely generate website-specific passwords from a single master password. Compatible with Password Hasher for Firefox.",
   "icons": {
      "16": "paw16.png",
@@ -9,15 +9,20 @@
     "128": "paw128.png"
   },
   "minimum_chrome_version": "20",
-  "content_security_policy": "default-src 'self'",
-  "browser_action": {
+  "content_security_policy": {
+    "extension_pages": "script-src 'self'; object-src 'self';",
+    "sandbox": "sandbox allow-scripts allow-forms allow-popups allow-modals; script-src 'self' 'unsafe-inline' 'unsafe-eval'; child-src 'self';"
+  },
+  "action": {
     "default_icon": "paw19.png",
     "default_popup": "popup.html"
   },
   "options_page": "options.html",
   "permissions": [
     "storage",
-    "tabs",
-    "<all_urls>"
+    "tabs"
+  ],
+  "host_permissions": [
+    "*://*/*"
   ]
 }