diff --git a/js/background.js b/js/background.js
index 0690a8518..c9661160a 100644
--- a/js/background.js
+++ b/js/background.js
@@ -28,6 +28,8 @@
         appWindow.close();
     });
 
+    textsecure.protocol_wrapper.startWorker();
+
     storage.fetch();
     storage.onready(function() {
         var messageReceiver;
diff --git a/js/panel_controller.js b/js/panel_controller.js
index 9e9d5f8f4..e8e67d7fc 100644
--- a/js/panel_controller.js
+++ b/js/panel_controller.js
@@ -21,8 +21,6 @@
 
     window.Whisper = window.Whisper || {};
 
-    textsecure.protocol_wrapper.startWorker();
-
     var conversations = new Whisper.ConversationCollection();
 
     window.inbox = new Whisper.ConversationCollection([], {