diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index 1b592fc73..ed1271d8f 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -186,6 +186,7 @@ class AtomEnvironment extends Model
     @registerDefaultOpeners()
     @registerDefaultDeserializers()
     @registerDefaultViewProviders()
+    @registerDefaultTargetForKeymaps()
 
     @installUncaughtErrorHandler()
     @installWindowEventHandler()
@@ -234,6 +235,9 @@ class AtomEnvironment extends Model
         when 'atom://.atom/init-script'
           @workspace.open(@getUserInitScriptPath())
 
+  registerDefaultTargetForKeymaps: ->
+    @keymaps.defaultTarget = @views.getView(@workspace)
+
   reset: (params) ->
     @deserializers.clear()
     @registerDefaultDeserializers()
@@ -593,9 +597,7 @@ class AtomEnvironment extends Model
 
     @packages.loadPackages()
 
-    workspaceElement = @views.getView(@workspace)
-    @keymaps.defaultTarget = workspaceElement
-    @document.body.appendChild(workspaceElement)
+    @document.body.appendChild(@views.getView(@workspace))
 
     @watchProjectPath()