diff --git a/src/manifest.json b/src/manifest.json
index 81e7fd2dea..ba2a1cd4c3 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -24,13 +24,14 @@
   },
   "content_scripts": [
     {
-      "matches": ["*://*/*"],
+      "matches": ["<all_urls>"],
       "exclude_matches": ["https://*.googleapis.com/*"],
       "js": ["contentScript.js"],
       "css": ["contentScript.css"],
       "all_frames": true,
       "match_about_blank": true,
-      "run_at": "document_idle"
+      "run_at": "document_idle",
+      "match_origin_as_fallback": true
     },
     {
       "matches": ["https://*/*"],
@@ -85,7 +86,7 @@
         "img/*",
         "*.css"
       ],
-      "matches": ["*://*/*"]
+      "matches": ["<all_urls>"]
     }
   ],
   "action": {