diff --git a/src/window-bootstrap.coffee b/src/window-bootstrap.coffee
index bf0aabb3a..fa7f9d354 100644
--- a/src/window-bootstrap.coffee
+++ b/src/window-bootstrap.coffee
@@ -1,10 +1,6 @@
 # Like sands through the hourglass, so are the days of our lives.
 startTime = Date.now()
 
-ModuleCache = require('./module-cache')
-ModuleCache.add(JSON.parse(decodeURIComponent(location.search.substr(14))).resourcePath)
-ModuleCache.register()
-
 require './window'
 
 Atom = require './atom'
diff --git a/static/index.js b/static/index.js
index 179026a66..5963863be 100644
--- a/static/index.js
+++ b/static/index.js
@@ -17,6 +17,11 @@ window.onload = function() {
     require('vm-compatibility-layer');
     require('coffee-script').register();
     require(path.resolve(__dirname, '..', 'src', 'coffee-cache')).register();
+
+    ModuleCache = require('./module-cache');
+    ModuleCache.add(loadSettings.resourcePath);
+    ModuleCache.register();
+
     require(loadSettings.bootstrapScript);
     ipc.sendChannel('window-command', 'window:loaded')
   }