diff --git a/js/background.js b/js/background.js
index 2bb8dd58b..5a506a3df 100644
--- a/js/background.js
+++ b/js/background.js
@@ -159,7 +159,7 @@
     function connect(firstRun) {
         window.removeEventListener('online', connect);
 
-        if (!Whisper.Registration.isDone()) { return; }
+        if (!Whisper.Registration.everDone()) { return; }
         if (Whisper.Import.isIncomplete()) { return; }
 
         if (messageReceiver) { messageReceiver.close(); }
diff --git a/main.js b/main.js
index 19e5edfa9..4174a8927 100644
--- a/main.js
+++ b/main.js
@@ -201,10 +201,10 @@ app.on('window-all-closed', function () {
 app.on('activate', function () {
   // On OS X it's common to re-create a window in the app when the
   // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
-    createWindow();
-  } else {
+  if (mainWindow) {
     mainWindow.show();
+  } else {
+    createWindow();
   }
 })