diff --git a/edit.html b/edit.html
index b1908c79..efe3d6a2 100644
--- a/edit.html
+++ b/edit.html
@@ -67,7 +67,6 @@
     <script src="js/localization.js"></script>
     <script src="js/script-loader.js"></script>
     <script src="js/storage-util.js"></script>
-    <script src="js/exclusions.js"></script>
     <script src="js/msg.js"></script>
 
     <script src="content/apply.js"></script>
@@ -88,11 +87,14 @@
     <script src="edit/applies-to-line-widget.js"></script>
     <script src="edit/reroute-hotkeys.js"></script>
     <script src="edit/codemirror-factory.js"></script>
-    <script src="edit/source-editor.js"></script>
+    <script src="edit/exclusions.js"></script>
     <script src="edit/colorpicker-helper.js"></script>
     <script src="edit/beautify.js"></script>
-    <script src="edit/sections-editor.js"></script>
     <script src="edit/show-keymap-help.js"></script>
+
+    <script src="edit/source-editor.js"></script>
+    <script src="edit/sections-editor.js"></script>
+
     <script src="edit/edit.js"></script>
 
     <script src="msgbox/msgbox.js" async></script>
diff --git a/edit/edit.js b/edit/edit.js
index 44962cb8..d4dbd0b2 100644
--- a/edit/edit.js
+++ b/edit/edit.js
@@ -214,6 +214,7 @@ preinit();
     return Promise.all([
       initStyleData(),
       onDOMready(),
+      prefs.initializing,
     ])
       .then(([style]) => {
         const usercss = isUsercss(style);
@@ -226,7 +227,6 @@ preinit();
         $('#beautify').onclick = () => beautify(editor.getEditors());
         $('#lint').addEventListener('scroll', hideLintHeaderOnScroll, {passive: true});
         window.addEventListener('resize', () => debounce(rememberWindowSize, 100));
-
         editor = usercss ? createSourceEditor(style) : createSectionsEditor(style);
         if (editor.ready) {
           return editor.ready();
@@ -408,6 +408,7 @@ function initStyleData() {
       // strip URL parameters when invoked for a non-existent id
       if (!style.id) {
         history.replaceState({}, document.title, location.pathname);
+        // FIXME: add style -> edit style
       }
       return style;
     });
diff --git a/manifest.json b/manifest.json
index 43b53d94..c362c735 100644
--- a/manifest.json
+++ b/manifest.json
@@ -28,7 +28,6 @@
       "js/msg.js",
       "js/storage-util.js",
       "js/sections-equal.js",
-      "background/storage-dummy.js",
       "background/storage.js",
       "js/prefs.js",
       "js/script-loader.js",
diff --git a/popup.html b/popup.html
index 4332ac23..81070088 100644
--- a/popup.html
+++ b/popup.html
@@ -166,7 +166,6 @@
   <script src="popup/hotkeys.js"></script>
   <script src="js/script-loader.js" async></script>
   <script src="js/storage-util.js" async></script>
-  <script src="js/exclusions.js" async></script>
   <script src="popup/popup-exclusions.js"></script>
 </head>