diff --git a/extensions/filefinder/filefinder-pane.coffee b/extensions/filefinder/filefinder-pane.coffee
index 5d6fbb6ce..93cc68e7a 100644
--- a/extensions/filefinder/filefinder-pane.coffee
+++ b/extensions/filefinder/filefinder-pane.coffee
@@ -40,7 +40,10 @@ class FilefinderPane extends Pane
     _paths = []
     for dir in File.list window.url
       continue if /\.git|Cocoa/.test dir
-      _paths.push File.listDirectoryTree dir
+      if File.isDirectory dir
+        _paths.push File.listDirectoryTree dir
+      else
+        _paths.push dir
     _.reject _.flatten(_paths), (dir) -> File.isDirectory dir
 
   showFinder: ->
diff --git a/extensions/filefinder/filefinder.coffee b/extensions/filefinder/filefinder.coffee
index 043a395bd..2d40bacaa 100644
--- a/extensions/filefinder/filefinder.coffee
+++ b/extensions/filefinder/filefinder.coffee
@@ -5,8 +5,10 @@ module.exports =
 class Filefinder extends Extension
   constructor: ->
     atom.keybinder.load require.resolve "filefinder/key-bindings.coffee"
+    atom.on 'project:load', @startup
 
-    @pane = new FilefinderPane @
+  startup: =>
+    @pane = new FilefinderPane this
 
   toggle: ->
-    @pane.toggle()
\ No newline at end of file
+    @pane?.toggle()
\ No newline at end of file