diff --git a/src/main-process/atom-window.coffee b/src/main-process/atom-window.coffee
index 36a7a25c6..774cbbf0f 100644
--- a/src/main-process/atom-window.coffee
+++ b/src/main-process/atom-window.coffee
@@ -158,15 +158,9 @@ class AtomWindow
     @setupContextMenu()
 
     if @isSpec
-      # Workaround for https://github.com/atom/atom-shell/issues/380
-      # Don't focus the window when it is being blurred during close or
-      # else the app will crash on Windows.
-      if process.platform is 'win32'
-        @browserWindow.on 'close', => @isWindowClosing = true
-
       # Spec window's web view should always have focus
       @browserWindow.on 'blur', =>
-        @browserWindow.focusOnWebView() unless @isWindowClosing
+        @browserWindow.focusOnWebView()
 
   openPath: (pathToOpen, initialLine, initialColumn) ->
     @openLocations([{pathToOpen, initialLine, initialColumn}])