diff --git a/web/src/scheduled_messages_overlay_ui.js b/web/src/scheduled_messages_overlay_ui.js
index 08cc2cb509..26edb6574b 100644
--- a/web/src/scheduled_messages_overlay_ui.js
+++ b/web/src/scheduled_messages_overlay_ui.js
@@ -45,7 +45,7 @@ export const keyboard_handling_context = {
     items_container_selector: "scheduled-messages-container",
     items_list_selector: "scheduled-messages-list",
     row_item_selector: "scheduled-message-row",
-    box_item_selector: "overlay-message-info-box",
+    box_item_selector: "scheduled-message-info-box",
     id_attribute_name: "data-scheduled-message-id",
 };
 
@@ -148,7 +148,7 @@ export function initialize() {
         e.preventDefault();
     });
 
-    $("body").on("focus", ".overlay-message-info-box", (e) => {
+    $("body").on("focus", ".scheduled-message-info-box", (e) => {
         messages_overlay_ui.activate_element(e.target, keyboard_handling_context);
     });
 }
diff --git a/web/templates/scheduled_message.hbs b/web/templates/scheduled_message.hbs
index 53fcba11c1..ea77454335 100644
--- a/web/templates/scheduled_message.hbs
+++ b/web/templates/scheduled_message.hbs
@@ -1,6 +1,6 @@
 {{#each scheduled_messages_data}}
     <div class="scheduled-message-row overlay-message-row" data-scheduled-message-id="{{scheduled_message_id}}">
-        <div class="overlay-message-info-box" tabindex="0">
+        <div class="scheduled-message-info-box overlay-message-info-box" tabindex="0">
             {{#if is_stream}}
             <div class="message_header message_header_stream">
                 <div class="message-header-contents" style="background: {{recipient_bar_color}};">