diff --git a/src/app/select-list.coffee b/src/app/select-list.coffee
index a6759337d..04d85172c 100644
--- a/src/app/select-list.coffee
+++ b/src/app/select-list.coffee
@@ -59,6 +59,7 @@ class SelectList extends View
       @loading.text(message).show()
 
   populateList: ->
+    return unless @hasParent()
     filterQuery = @miniEditor.getText()
     if filterQuery.length
       filteredArray = fuzzyFilter(@array, filterQuery, key: @filterKey)
diff --git a/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee b/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee
index 02eafcbee..047190757 100644
--- a/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee
+++ b/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee
@@ -1,6 +1,7 @@
 {View, $$} = require 'space-pen'
 SelectList = require 'select-list'
 _ = require 'underscore'
+$ = require 'jquery'
 Editor = require 'editor'
 
 module.exports =
@@ -20,6 +21,7 @@ class FuzzyFinder extends SelectList
 
   initialize: (@rootView) ->
     super
+    $(window).on 'focus', => @array = null
 
   itemForElement: (path) ->
     $$ -> @li path
@@ -39,8 +41,8 @@ class FuzzyFinder extends SelectList
     else
       return unless @rootView.project.getPath()?
       @allowActiveEditorChange = false
-      @populateProjectPaths()
       @attach()
+      @populateProjectPaths()
 
   toggleBufferFinder: ->
     if @hasParent()