diff --git a/spec/extensions/file-finder-spec.coffee b/spec/extensions/file-finder-spec.coffee
index 2f273d891..216b06b88 100644
--- a/spec/extensions/file-finder-spec.coffee
+++ b/spec/extensions/file-finder-spec.coffee
@@ -133,13 +133,14 @@ describe 'FileFinder', ->
     [editor1, editor2] = []
 
     beforeEach ->
-      rootView.find('.editor').trigger 'split-right'
-      [editor1, editor2] = rootView.find('.editor').map -> $(this).view()
-
+      rootView.attachToDom()
+      editor1 = rootView.activeEditor()
+      editor2 = editor1.splitRight()
+      expect(rootView.activeEditor()).toBe editor2
       rootView.trigger 'file-finder:toggle'
 
     describe "when there is a path selected", ->
-      it "opens the file associated with that path in the editor", ->
+      fit "opens the file associated with that path in the editor", ->
         finder.trigger 'move-down'
         selectedLi = finder.find('li:eq(1)')
 
diff --git a/src/extensions/file-finder.coffee b/src/extensions/file-finder.coffee
index 080896e2f..c06df36b6 100644
--- a/src/extensions/file-finder.coffee
+++ b/src/extensions/file-finder.coffee
@@ -27,7 +27,6 @@ class FileFinder extends View
     @on 'move-down', => @moveDown()
     @on 'file-finder:select-file', => @select()
 
-    @miniEditor.on 'focusout', => @detach()
     @miniEditor.buffer.on 'change', => @populatePathList() if @hasParent()
     @miniEditor.off 'move-up move-down'
 
@@ -41,8 +40,11 @@ class FileFinder extends View
     @rootView.project.getFilePaths().done (@paths) => @populatePathList()
     @rootView.append(this)
     @miniEditor.focus()
+    @miniEditor.on 'focusout', => @detach()
 
   detach: ->
+    console.log "in detach, focusing root view"
+    @miniEditor.off 'focusout'
     @rootView.focus()
     super
     @miniEditor.setText('')