diff --git a/js/background.js b/js/background.js
index 7019d549..2f754003 100644
--- a/js/background.js
+++ b/js/background.js
@@ -20,11 +20,6 @@
     storage.onready(function() {
         var messageReceiver;
 
-        if (!storage.get('first_install_ran')) {
-            storage.put('first_install_ran', 1);
-            extension.install();
-        }
-
         if (textsecure.registration.isDone()) {
             init();
         }
diff --git a/js/panel_controller.js b/js/panel_controller.js
index 60f920d6..691a24cd 100644
--- a/js/panel_controller.js
+++ b/js/panel_controller.js
@@ -139,7 +139,14 @@
             });
         }
     };
-    extension.onLaunched(openInbox);
+
+    extension.onLaunched(function() {
+        if (textsecure.registration.isDone()) {
+            openInbox();
+        } else {
+            extension.install();
+        }
+    });
 
     // make sure windows are cleaned up on close
     extension.windows.onClosed(function (windowId) {