diff --git a/templates/zerver/app/index.html b/templates/zerver/app/index.html
index 7bdcf57d22..29ebcde0f5 100644
--- a/templates/zerver/app/index.html
+++ b/templates/zerver/app/index.html
@@ -248,9 +248,11 @@
                         <div id="loading_older_messages_indicator"></div>
                         <div id="page_loading_indicator"></div>
                         <div id="message_feed_errors_container"></div>
-                        <div class="message-list focused-message-list" id="zhome" role="list" aria-live="polite" aria-label="{{ _('Messages') }}">
-                        </div>
-                        <div class="message-list" id="zfilt" role="list" aria-live="polite" aria-label="{{ _('Messages') }}">
+                        <div id="message-lists-container">
+                            <div class="message-list focused-message-list" id="zhome" role="list" aria-live="polite" aria-label="{{ _('Messages') }}">
+                            </div>
+                            <div class="message-list" id="zfilt" role="list" aria-live="polite" aria-label="{{ _('Messages') }}">
+                            </div>
                         </div>
                         <div id="typing_notifications">
                         </div>