diff --git a/js/panel_controller.js b/js/panel_controller.js
index fc6556efb2..53d9a3db4c 100644
--- a/js/panel_controller.js
+++ b/js/panel_controller.js
@@ -43,6 +43,10 @@
                 appWindow = windowInfo;
                 inboxWindowId = appWindow.id;
 
+                appWindow.contentWindow.addEventListener('load', function() {
+                    setUnreadCount(storage.get("unreadCount", 0));
+                });
+
                 appWindow.onClosed.addListener(function () {
                     inboxOpened = false;
                     appWindow = null;
@@ -75,13 +79,11 @@
         if (count > 0) {
             extension.navigator.setBadgeText(count);
             if (inboxOpened === true) {
-                var appWindow = chrome.app.window.get(inboxWindowId);
                 appWindow.contentWindow.document.title = "Signal (" + count + ")";
             }
         } else {
             extension.navigator.setBadgeText("");
             if (inboxOpened === true) {
-                var appWindow = chrome.app.window.get(inboxWindowId);
                 appWindow.contentWindow.document.title = "Signal";
             }
         }