diff --git a/app/src/browser/window-manager.es6 b/app/src/browser/window-manager.es6
index 784b377da..7ac185a4b 100644
--- a/app/src/browser/window-manager.es6
+++ b/app/src/browser/window-manager.es6
@@ -122,6 +122,9 @@ export default class WindowManager {
   _didCreateNewWindow = win => {
     win.browserWindow.on('closed', () => {
       delete this._windows[win.windowKey];
+      if (this.windowLauncher.hotWindow === win) {
+        this.windowLauncher.hotWindow = null;
+      }
       this.quitWinLinuxIfNoWindows();
     });