diff --git a/src/atom/file-finder.coffee b/src/atom/file-finder.coffee
index a1f93d9cd..95130995d 100644
--- a/src/atom/file-finder.coffee
+++ b/src/atom/file-finder.coffee
@@ -18,8 +18,10 @@ class FileFinder extends View
     @maxResults = 10
     @populateUrlList()
     window.keymap.bindKeys ".file-finder .editor",
-      'enter': 'file-finder:select-file'
+      'enter': 'file-finder:select-file',
+      'escape': 'file-finder:close'
 
+    @on 'file-finder:close', => @remove()
     @on 'move-up', => @moveUp()
     @on 'move-down', => @moveDown()
     @on 'file-finder:select-file', => @select()