diff --git a/edit.html b/edit.html
index fbb1ed9c..5df54d54 100644
--- a/edit.html
+++ b/edit.html
@@ -3,7 +3,7 @@
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
 
     <script src="js/dom.js"></script>
-    <script src="background/messaging.js"></script>
+    <script src="js/messaging.js"></script>
     <script src="js/prefs.js"></script>
     <script src="js/localization.js"></script>
     <script src="content/apply.js"></script>
diff --git a/index.html b/index.html
index ea19ac4f..c673ac44 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
   <title i18n-text-append="optionsHeading">Stylus </title>
   <link rel="stylesheet" href="options/index.css">
   <script src="js/dom.js"></script>
-  <script src="background/messaging.js"></script>
+  <script src="js/messaging.js"></script>
   <script src="js/localization.js"></script>
   <script src="js/prefs.js"></script>
   <script src="content/apply.js"></script>
diff --git a/background/messaging.js b/js/messaging.js
similarity index 100%
rename from background/messaging.js
rename to js/messaging.js
diff --git a/manage.html b/manage.html
index 855db9eb..b3bb0545 100644
--- a/manage.html
+++ b/manage.html
@@ -122,7 +122,7 @@
   </template>
 
   <script src="js/dom.js"></script>
-  <script src="background/messaging.js"></script>
+  <script src="js/messaging.js"></script>
   <script src="js/prefs.js"></script>
   <script src="content/apply.js"></script>
   <script src="js/localization.js"></script>
diff --git a/manifest.json b/manifest.json
index 97b600e4..2070b4ba 100644
--- a/manifest.json
+++ b/manifest.json
@@ -20,7 +20,7 @@
   ],
   "background": {
     "scripts": [
-      "background/messaging.js",
+      "js/messaging.js",
       "background/storage.js",
       "js/prefs.js",
       "background/background.js",
diff --git a/popup.html b/popup.html
index fe5c967f..933df669 100644
--- a/popup.html
+++ b/popup.html
@@ -56,7 +56,7 @@
   </template>
 
   <script src="js/dom.js"></script>
-  <script src="background/messaging.js"></script>
+  <script src="js/messaging.js"></script>
   <script src="js/localization.js"></script>
   <script src="js/prefs.js"></script>
   <script src="content/apply.js"></script>