diff --git a/js/conversation_controller.js b/js/conversation_controller.js
index e9591879f5..d1164f74ce 100644
--- a/js/conversation_controller.js
+++ b/js/conversation_controller.js
@@ -62,7 +62,13 @@
             );
             storage.put("unreadCount", newUnreadCount);
 
-            setUnreadCount(newUnreadCount);
+            if (newUnreadCount > 0) {
+                window.setBadgeCount(newUnreadCount);
+                window.document.title = "Signal (" + newUnreadCount + ")";
+            } else {
+                window.setBadgeCount(0);
+                window.document.title = "Signal";
+            }
             if (newUnreadCount === 0) {
                 window.clearAttention();
             }
diff --git a/js/panel_controller.js b/js/panel_controller.js
index 43525bed0c..cfec29c238 100644
--- a/js/panel_controller.js
+++ b/js/panel_controller.js
@@ -25,14 +25,4 @@
     };
     var inboxWindowId = 'inbox';
 
-    window.setUnreadCount = function(count) {
-        if (count > 0) {
-            window.setBadgeCount(count);
-            window.document.title = "Signal (" + count + ")";
-        } else {
-            window.setBadgeCount(0);
-            window.document.title = "Signal";
-        }
-    };
-
 })();