diff --git a/src/packages/tree-view/lib/tree-view.coffee b/src/packages/tree-view/lib/tree-view.coffee
index 9e71a5a05..ff0408607 100644
--- a/src/packages/tree-view/lib/tree-view.coffee
+++ b/src/packages/tree-view/lib/tree-view.coffee
@@ -72,15 +72,12 @@ class TreeView extends ScrollView
     if @hasFocus()
       @detach()
     else
-      if @hasParent()
-        @focus()
-      else
-        @attach()
+      @attach() unless @hasParent()
+      @focus()
 
   attach: ->
     return unless project.getPath()
     rootView.horizontal.prepend(this)
-    @focus()
 
   detach: ->
     @scrollTopAfterAttach = @scrollTop()
@@ -134,6 +131,7 @@ class TreeView extends ScrollView
 
   revealActiveFile: ->
     @attach()
+    @focus()
 
     return unless activeFilePath = rootView.getActiveEditor()?.getPath()