diff --git a/static/js/stream_popover.js b/static/js/stream_popover.js
index 3f1484eb8f..3e40152baa 100644
--- a/static/js/stream_popover.js
+++ b/static/js/stream_popover.js
@@ -99,7 +99,7 @@ function build_stream_popover(e) {
 
     $(elt).popover("show");
     var data_id = stream_data.get_sub(stream).stream_id;
-    var popover = $('.streams_popover[data-id=' + data_id + ']');
+    var popover = $('.streams_popover[data-stream-id=' + data_id + ']');
 
     update_spectrum(popover, function (colorpicker) {
         colorpicker.spectrum(stream_color.sidebar_popover_colorpicker_options);
diff --git a/static/templates/stream_sidebar_actions.handlebars b/static/templates/stream_sidebar_actions.handlebars
index 753c3df1dd..f9559b08a7 100644
--- a/static/templates/stream_sidebar_actions.handlebars
+++ b/static/templates/stream_sidebar_actions.handlebars
@@ -1,5 +1,5 @@
 {{! Contents of the "stream actions" popup }}
-<ul class="nav nav-list streams_popover" data-id="{{ stream.stream_id }}" data-name="{{ stream.name }}">
+<ul class="nav nav-list streams_popover" data-stream-id="{{ stream.stream_id }}" data-name="{{ stream.name }}">
     <li>
         <a class="open_stream_settings">
             <i class="icon-vector-cog"></i>