diff --git a/index.js b/index.js
index 8b1618b..6bf493c 100644
--- a/index.js
+++ b/index.js
@@ -83,7 +83,10 @@ mb.on('ready', function() {
 
         config.set('access_token', token, function(err) {
           if (err) throw err
-          if (loginWindow) loginWindow.close()
+          if (loginWindow) {
+            loginWindow.removeListener('close', App.quit)
+            loginWindow.close()
+          }
           initialize()
         })
         break