diff --git a/static/js/stream_color.js b/static/js/stream_color.js
index cf05dda121..7e2acb6319 100644
--- a/static/js/stream_color.js
+++ b/static/js/stream_color.js
@@ -45,9 +45,12 @@ function update_table_stream_color(table, stream_name, color) {
     var stream_labels = $("#floating_recipient_bar").add(table).find(".stream_label");
 
     _.each(stream_labels, function (label) {
-        if ($.trim($(label).text()) === stream_name) {
-            $(label).css({"background": style,
+        var $label = $(label);
+        if ($.trim($label.text()) === stream_name) {
+            $label.css({"background": style,
                           "border-left-color": style});
+            $label.removeClass(exports.color_classes);
+            $label.addClass(color_class);
         }
     });
 }
diff --git a/static/js/tab_bar.js b/static/js/tab_bar.js
index 82c9de844d..3dfc986cd5 100644
--- a/static/js/tab_bar.js
+++ b/static/js/tab_bar.js
@@ -128,6 +128,7 @@ exports.colorize_tab_bar = function () {
                 }
               );
             }
+            stream_tab.removeClass(stream_color.color_classes);
             stream_tab.addClass(stream_dark);
         }
     }