diff --git a/src/main-process/atom-window.coffee b/src/main-process/atom-window.coffee
index b69c417a8..f9db631bb 100644
--- a/src/main-process/atom-window.coffee
+++ b/src/main-process/atom-window.coffee
@@ -157,6 +157,9 @@ class AtomWindow
 
     @setupContextMenu()
 
+    @browserWindow.on 'blur', =>
+      @browserWindow.focusOnWebView()
+
   openPath: (pathToOpen, initialLine, initialColumn) ->
     @openLocations([{pathToOpen, initialLine, initialColumn}])