diff --git a/src/browser/application-menu.coffee b/src/browser/application-menu.coffee
index 3432d86b2..6a27b4483 100644
--- a/src/browser/application-menu.coffee
+++ b/src/browser/application-menu.coffee
@@ -48,6 +48,7 @@ class ApplicationMenu
 
     window.on 'focus', focusHandler
     window.once 'closed', =>
+      @lastFocusedWindow = null if window is @lastFocusedWindow
       @windowTemplates.delete(window)
       window.removeListener 'focus', focusHandler