diff --git a/templates/zerver/app/index.html b/templates/zerver/app/index.html
index fb169b76d8..d3c1cf2fe2 100644
--- a/templates/zerver/app/index.html
+++ b/templates/zerver/app/index.html
@@ -248,7 +248,7 @@
                         <div id="loading_older_messages_indicator"></div>
                         <div id="page_loading_indicator"></div>
                         <div id="message_feed_errors_container"></div>
-                        <div class="message_table focused_table" id="zhome" role="list" aria-live="polite" aria-label="{{ _('Messages') }}">
+                        <div class="message_table focused-message-list" id="zhome" role="list" aria-live="polite" aria-label="{{ _('Messages') }}">
                         </div>
                         <div class="message_table" id="zfilt" role="list" aria-live="polite" aria-label="{{ _('Messages') }}">
                         </div>
diff --git a/web/src/lightbox.js b/web/src/lightbox.js
index e3bf7168df..ece9a0d753 100644
--- a/web/src/lightbox.js
+++ b/web/src/lightbox.js
@@ -176,7 +176,9 @@ export function clear_for_testing() {
 
 export function render_lightbox_list_images(preview_source) {
     if (!is_open) {
-        const images = Array.prototype.slice.call($(".focused_table .message_inline_image img"));
+        const images = Array.prototype.slice.call(
+            $(".focused-message-list .message_inline_image img"),
+        );
         const $image_list = $("#lightbox_overlay .image-list").empty();
 
         for (const img of images) {
diff --git a/web/src/message_list_tooltips.js b/web/src/message_list_tooltips.js
index bb05b42788..415712b77a 100644
--- a/web/src/message_list_tooltips.js
+++ b/web/src/message_list_tooltips.js
@@ -121,7 +121,7 @@ export function initialize() {
             }
 
             const config = {attributes: false, childList: true, subtree: true};
-            const target = $elem.parents(".message_table.focused_table").get(0);
+            const target = $elem.parents(".message_table.focused-message-list").get(0);
             const nodes_to_check_for_removal = [
                 $elem.parents(".recipient_row").get(0),
                 $elem.parents(".message_reactions").get(0),
diff --git a/web/src/narrow.js b/web/src/narrow.js
index 8434c05d41..ff8b86d6bc 100644
--- a/web/src/narrow.js
+++ b/web/src/narrow.js
@@ -465,8 +465,8 @@ export function activate(raw_operators, opts) {
         // the view right as it's being shown, because we rely on message_lists.current
         // being shown for deciding when to condense messages.
         $("body").addClass("narrowed_view");
-        $("#zfilt").addClass("focused_table");
-        $("#zhome").removeClass("focused_table");
+        $("#zfilt").addClass("focused-message-list");
+        $("#zhome").removeClass("focused-message-list");
 
         message_lists.set_current(msg_list);
 
@@ -1056,8 +1056,8 @@ export function deactivate(coming_from_recent_topics = false, is_actively_scroll
         has_shown_message_list_view = true;
 
         $("body").removeClass("narrowed_view");
-        $("#zfilt").removeClass("focused_table");
-        $("#zhome").addClass("focused_table");
+        $("#zfilt").removeClass("focused-message-list");
+        $("#zhome").addClass("focused-message-list");
         message_lists.set_current(message_lists.home);
         message_lists.current.resume_reading();
         condense.condense_and_collapse($("#zhome div.message_row"));
diff --git a/web/src/rows.js b/web/src/rows.js
index 62c9b0adaf..a5556dd037 100644
--- a/web/src/rows.js
+++ b/web/src/rows.js
@@ -39,11 +39,11 @@ export function prev_visible($message_row) {
 }
 
 export function first_visible() {
-    return $(".focused_table .selectable_row").first();
+    return $(".focused-message-list .selectable_row").first();
 }
 
 export function last_visible() {
-    return $(".focused_table .selectable_row").last();
+    return $(".focused-message-list .selectable_row").last();
 }
 
 export function visible_range(start_id, end_id) {
diff --git a/web/styles/zulip.css b/web/styles/zulip.css
index 3ad12cf32d..702d8c677c 100644
--- a/web/styles/zulip.css
+++ b/web/styles/zulip.css
@@ -1690,7 +1690,7 @@ div.message_table {
     width: 100%;
 }
 
-div.focused_table {
+div.focused-message-list {
     display: block;
 }
 
diff --git a/web/tests/lightbox.test.js b/web/tests/lightbox.test.js
index db82a1288b..a8dd16d877 100644
--- a/web/tests/lightbox.test.js
+++ b/web/tests/lightbox.test.js
@@ -53,7 +53,7 @@ test("pan_and_zoom", ({override}) => {
         return "message-stub";
     };
 
-    $.create(".focused_table .message_inline_image img", {children: []});
+    $.create(".focused-message-list .message_inline_image img", {children: []});
     const open_image = lightbox.build_open_image_function();
     open_image($img);
 
@@ -86,7 +86,7 @@ test("youtube", ({override}) => {
     $link.closest = () => $msg;
     $link.attr("href", href);
 
-    $.create(".focused_table .message_inline_image img", {children: []});
+    $.create(".focused-message-list .message_inline_image img", {children: []});
 
     const open_image = lightbox.build_open_image_function();
     open_image($img);