diff --git a/src/app/keymaps/tree-view.coffee b/src/app/keymaps/tree-view.coffee
index 4b886f115..de150c6ad 100644
--- a/src/app/keymaps/tree-view.coffee
+++ b/src/app/keymaps/tree-view.coffee
@@ -1,4 +1,4 @@
-window.keymap.bindKeys '.editor'
+window.keymap.bindKeys '#root-view'
   'alt-tab': 'tree-view:focus'
 
 window.keymap.bindKeys '.tree-view'
diff --git a/src/extensions/tree-view/tree-view.coffee b/src/extensions/tree-view/tree-view.coffee
index fd423882d..6e65d3d53 100644
--- a/src/extensions/tree-view/tree-view.coffee
+++ b/src/extensions/tree-view/tree-view.coffee
@@ -34,7 +34,7 @@ class TreeView extends View
     @on 'tree-view:directory-modified', => @selectActiveFile()
     @rootView.on 'active-editor-path-change', => @selectActiveFile()
 
-    @on 'tree-view:unfocus', => @rootView.activeEditor().focus()
+    @on 'tree-view:unfocus', => @rootView.activeEditor()?.focus()
     @rootView.on 'tree-view:focus', => this.focus()
 
   deactivate: ->