diff --git a/js/background.js b/js/background.js
index 686065623..78b04b17d 100644
--- a/js/background.js
+++ b/js/background.js
@@ -18,6 +18,8 @@
 
     textsecure.protocol_wrapper.startWorker();
 
+    ConversationController.updateInbox();
+
     extension.onLaunched(function() {
         storage.onready(function() {
             if (textsecure.registration.isDone()) {
diff --git a/js/conversation_controller.js b/js/conversation_controller.js
index 77204f003..8c4063d04 100644
--- a/js/conversation_controller.js
+++ b/js/conversation_controller.js
@@ -37,9 +37,6 @@
         }
     }))();
 
-    // Load the initial set of models for the inbox.
-    conversations.fetchActive();
-
     window.getInboxCollection = function() {
         return inboxCollection;
     };
@@ -71,6 +68,9 @@
                     }
                 });
             });
+        },
+        updateInbox: function() {
+            conversations.fetchActive();
         }
     };
 })();