diff --git a/src/atom-application.coffee b/src/atom-application.coffee
index bb8dce0a9..da51cc3c3 100644
--- a/src/atom-application.coffee
+++ b/src/atom-application.coffee
@@ -139,6 +139,10 @@ class AtomApplication
     app.on 'window-all-closed', ->
       app.quit()
 
+    app.on 'open-file', (event, filePath) =>
+      event.preventDefault()
+      @openPath filePath
+
     ipc.on 'close-without-confirm', (processId, routingId) ->
       window = BrowserWindow.fromProcessIdAndRoutingId processId, routingId
       window.removeAllListeners 'close'