diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index de410ef23..363371ed7 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -133,6 +133,7 @@ class AtomEnvironment extends Model
 
     CommandRegistry = require './command-registry'
     @commands = new CommandRegistry
+    @commands.attach(@window)
 
     GrammarRegistry = require './grammar-registry'
     @grammars = new GrammarRegistry({@config})
@@ -607,8 +608,6 @@ class AtomEnvironment extends Model
       @setAutoHideMenuBar(newValue)
     @setAutoHideMenuBar(true) if @config.get('core.autoHideMenuBar')
 
-    @commands.attach(window)
-
     @openInitialEmptyEditorIfNecessary()
 
   unloadEditorWindow: ->