diff --git a/src/atom.coffee b/src/atom.coffee
index a40e44764..342399dec 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -14,10 +14,12 @@ PackageManager = require './package-manager'
 ThemeManager = require './theme-manager'
 ContextMenuManager = require './context-menu-manager'
 
-window.atom =
-  packages: new PackageManager()
-  themes: new ThemeManager()
-  contextMenu: new ContextMenuManager(remote.getCurrentWindow().loadSettings.devMode)
+module.exports =
+class Atom
+  constructor: ->
+    @packages = new PackageManager()
+    @themes = new ThemeManager()
+    @contextMenu = new ContextMenuManager(@getLoadSettings().devMode)
 
   getLoadSettings: ->
     @getCurrentWindow().loadSettings
diff --git a/src/window-bootstrap.coffee b/src/window-bootstrap.coffee
index bccf2ee92..26760e9f5 100644
--- a/src/window-bootstrap.coffee
+++ b/src/window-bootstrap.coffee
@@ -1,9 +1,10 @@
 # Like sands through the hourglass, so are the days of our lives.
 startTime = new Date().getTime()
 
-require './atom'
+Atom = require './atom'
 require './window'
 
+window.atom = new Atom()
 window.setUpEnvironment('editor')
 window.startEditorWindow()
 console.log "Window load time: #{new Date().getTime() - startTime}ms"