diff --git a/src/atom/window.coffee b/src/atom/window.coffee
index f62ab7361..716c0d186 100644
--- a/src/atom/window.coffee
+++ b/src/atom/window.coffee
@@ -33,7 +33,9 @@ windowAdditions =
     $(window).unbind('keydown')
 
   findFile: ->
-    window.layout.addPane(FileFinder.build(urls: [@editor.buffer.url]))
+    fileFinder = FileFinder.build(urls: [@editor.buffer.url])
+    window.layout.addPane(fileFinder)
+    fileFinder.input.focus()
 
   bindKeys: ->
     @bindKey 'meta+s', => @editor.save()