diff --git a/src/browser/window-manager.coffee b/src/browser/window-manager.coffee
index 4211de130..16ec8f37e 100644
--- a/src/browser/window-manager.coffee
+++ b/src/browser/window-manager.coffee
@@ -15,6 +15,7 @@ class WindowManager
       @ensurePrimaryWindowOnscreen()
 
   ensurePrimaryWindowOnscreen: ->
+    return if global.application.quitting
     hasToken = @config.get('nylas.token')
     if hasToken
       @showMainWindow()