diff --git a/static/js/topic_list.js b/static/js/topic_list.js
index 598e74a368..40b248f582 100644
--- a/static/js/topic_list.js
+++ b/static/js/topic_list.js
@@ -148,7 +148,7 @@ exports.set_click_handlers = function (callbacks) {
         e.stopPropagation();
     });
 
-    $('#stream_filters').on('click', '.subject_box', function (e) {
+    $('#stream_filters').on('click', '.topic-box', function (e) {
         if (e.metaKey || e.ctrlKey) {
             return;
         }
diff --git a/static/styles/left-sidebar.css b/static/styles/left-sidebar.css
index d88a90c9a5..cc2f0c2d34 100644
--- a/static/styles/left-sidebar.css
+++ b/static/styles/left-sidebar.css
@@ -299,12 +299,14 @@ li.expanded_private_message {
     margin-bottom: -5px;
 }
 
-.subject_box {
+.pm-box,
+.topic-box {
     display: block;
     margin-right: 38px;
 }
 
-.zero-subject-unreads .subject_box {
+.zero-subject-unreads .pm-box,
+.zero-subject-unreads .topic-box {
     margin-right: 15px;
 }
 
diff --git a/static/templates/sidebar_private_message_list.handlebars b/static/templates/sidebar_private_message_list.handlebars
index b19038a1a8..3607a648dc 100644
--- a/static/templates/sidebar_private_message_list.handlebars
+++ b/static/templates/sidebar_private_message_list.handlebars
@@ -1,7 +1,7 @@
 <ul class='expanded_private_messages' data-name='private'>
     {{#each messages}}
     <li class='{{#if is_zero}}zero-subject-unreads{{/if}} {{#if zoom_out_hide}}zoom-out-hide{{/if}} expanded_private_message' data-name='{{reply_to}}'>
-      <span class='subject_box'>
+      <span class='pm-box'>
         <a href='{{url}}' class="conversation-partners">
           {{recipients}}
         </a>
diff --git a/static/templates/topic_list_item.handlebars b/static/templates/topic_list_item.handlebars
index b1d8de65ce..4175c061b2 100644
--- a/static/templates/topic_list_item.handlebars
+++ b/static/templates/topic_list_item.handlebars
@@ -1,5 +1,5 @@
 <li class='{{#if is_zero}}zero-subject-unreads{{/if}} {{#if is_muted}}muted_topic{{/if}} {{#if zoom_out_hide}} zoom-out-hide{{/if}} topic-list-item' data-name='{{topic_name}}'>
-    <span class='subject_box'>
+    <span class='topic-box'>
         <a href='{{url}}' class="subject-name">
             {{topic_name}}
         </a>