diff --git a/web/templates/draft.hbs b/web/templates/draft.hbs
index ff16b96d45..2c2c67fd8f 100644
--- a/web/templates/draft.hbs
+++ b/web/templates/draft.hbs
@@ -15,9 +15,9 @@
                 </div>
                 <span class="stream_topic_separator"><i class="zulip-icon zulip-icon-chevron-right"></i></span>
                 <span class="stream_topic">
-                    <div class="message_label_clickable narrows_by_topic">
+                    <span class="message_label_clickable narrows_by_topic">
                         <span class="stream-topic-inner {{#if is_empty_string_topic}}empty-topic-display{{/if}}">{{topic_display_name}}</span>
-                    </div>
+                    </span>
                 </span>
                 <span class="recipient_bar_controls"></span>
                 <div class="recipient_row_date">{{ time_stamp }}</div>
diff --git a/web/templates/scheduled_message.hbs b/web/templates/scheduled_message.hbs
index f818aaf3af..47054c41fa 100644
--- a/web/templates/scheduled_message.hbs
+++ b/web/templates/scheduled_message.hbs
@@ -12,9 +12,9 @@
                     </div>
                     <span class="stream_topic_separator"><i class="zulip-icon zulip-icon-chevron-right"></i></span>
                     <span class="stream_topic">
-                        <div class="message_label_clickable narrows_by_topic">
+                        <span class="message_label_clickable narrows_by_topic">
                             <span {{#if is_empty_string_topic}}class="empty-topic-display"{{/if}}>{{topic_display_name}}</span>
-                        </div>
+                        </span>
                     </span>
                     <span class="recipient_bar_controls"></span>
                     {{> scheduled_message_stream_pm_common .}}