diff --git a/main/index.js b/main/index.js
index 2f61ba8c..76632ad2 100644
--- a/main/index.js
+++ b/main/index.js
@@ -43,6 +43,7 @@ function init () {
     app.setPath('userData', config.CONFIG_PATH)
   }
 
+  app.isReady = false // app ready, windows can be created
   app.ipcReady = false // main window has finished loading and IPC is ready
   app.isQuitting = false
 
@@ -57,6 +58,8 @@ function init () {
   })
 
   app.on('ready', function () {
+    app.isReady = true
+
     windows.createMainWindow()
     windows.createWebTorrentHiddenWindow()
     menu.init()
@@ -83,7 +86,7 @@ function init () {
   })
 
   app.on('activate', function () {
-    windows.createMainWindow()
+    if (app.isReady) windows.createMainWindow()
   })
 }