diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 2bcf34127d..4de9e299d3 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -122,11 +122,13 @@ function replace_floating_recipient_bar(desired_label) {
                 desired_label.children(".message_header_stream.right_part").clone());
             $("#current_label_huddle").css('display', 'none');
             $("#current_label_stream").css('display', 'table-row');
+            $("#current_label_stream").attr("zid", desired_label.attr("zid"));
         } else {
             $("#current_label_huddle td:last").replaceWith(
                 desired_label.children(".message_header_huddle.right_part").clone());
             $("#current_label_stream").css('display', 'none');
             $("#current_label_huddle").css('display', 'table-row');
+            $("#current_label_huddle").attr("zid", desired_label.attr("zid"));
         }
         old_label = desired_label;
     }
@@ -547,13 +549,13 @@ $(function () {
         }
     });
 
-    $("#main_div").on("click", ".narrows_by_recipient", function (e) {
+    $("#home").on("click", ".narrows_by_recipient", function (e) {
         var row = $(this).closest(".recipient_row");
         narrow.target(row.attr('zid'));
         narrow.by_recipient();
     });
 
-    $("#main_div").on("click", ".narrows_by_subject", function (e) {
+    $("#home").on("click", ".narrows_by_subject", function (e) {
         var row = $(this).closest(".recipient_row");
         narrow.target(row.attr('zid'));
         narrow.by_subject();