diff --git a/spec/atom/file-finder-spec.coffee b/spec/atom/file-finder-spec.coffee
index 73fa6cd97..91cb703e9 100644
--- a/spec/atom/file-finder-spec.coffee
+++ b/spec/atom/file-finder-spec.coffee
@@ -65,9 +65,11 @@ describe 'FileFinder', ->
       finder = FileFinder.build {urls, selected: selectedCallback}
 
     it "when a file is selected Editor.open is called", ->
+      spyOn(finder, 'remove')
       finder.moveDown()
       finder.select()
       expect(selectedCallback).toHaveBeenCalledWith(urls[1])
+      expect(finder.remove).toHaveBeenCalled()
 
     it "when no file is selected, does nothing", ->
       spyOn(atom, 'open')
diff --git a/src/atom/file-finder.coffee b/src/atom/file-finder.coffee
index cdad3bf00..8c980ec8e 100644
--- a/src/atom/file-finder.coffee
+++ b/src/atom/file-finder.coffee
@@ -35,6 +35,7 @@ class FileFinder extends Template
     select: ->
       filePath = @findSelectedLi().text()
       @selected(filePath) if filePath and @selected
+      @remove()
 
     moveUp: ->
       @findSelectedLi()
diff --git a/src/atom/root-view.coffee b/src/atom/root-view.coffee
index 17560521b..d76449502 100644
--- a/src/atom/root-view.coffee
+++ b/src/atom/root-view.coffee
@@ -38,7 +38,7 @@ class RootView extends Template
     toggleFileFinder: ->
       return unless @project
 
-      if @fileFinder
+      if @fileFinder and @fileFinder.parent()[0]
         @fileFinder.remove()
         @fileFinder = null
       else