diff --git a/js/popup.js b/js/popup.js
index ba83d5a31..78a1760a0 100644
--- a/js/popup.js
+++ b/js/popup.js
@@ -68,5 +68,8 @@ textsecure.registerOnLoadFunction(function() {
     } else {
         textsecure.storage.putUnencrypted("unreadCount", 0);
         extension.navigator.setBadgeText("");
+        if (Whisper.Threads.length) {
+            Whisper.Threads.at(0).trigger('render');
+        }
     }
 });