diff --git a/web/src/scheduled_messages_overlay_ui.ts b/web/src/scheduled_messages_overlay_ui.ts
index ced1c191bc..636acc93e8 100644
--- a/web/src/scheduled_messages_overlay_ui.ts
+++ b/web/src/scheduled_messages_overlay_ui.ts
@@ -146,7 +146,6 @@ export function launch(): void {
 
     const first_element_id = keyboard_handling_context.get_items_ids()[0];
     messages_overlay_ui.set_initial_element(first_element_id, keyboard_handling_context);
-    messages_overlay_ui.initialize_restore_overlay_message_tooltip();
 }
 
 export function rerender(): void {
diff --git a/web/templates/scheduled_message.hbs b/web/templates/scheduled_message.hbs
index a92da03a5c..48b6bf789a 100644
--- a/web/templates/scheduled_message.hbs
+++ b/web/templates/scheduled_message.hbs
@@ -36,11 +36,10 @@
                     <div class="messagebox-content">
                         <div class="message_top_line">
                             <div class="overlay_message_controls">
-                                <i class="fa fa-pencil fa-lg restore-overlay-message tippy-zulip-tooltip" aria-hidden="true" data-tooltip-template-id="restore-scheduled-message-tooltip-template"></i>
                                 {{> ./components/icon_button intent="danger" custom_classes="delete-overlay-message tippy-zulip-tooltip" icon="trash" data-tooltip-template-id="delete-scheduled-message-tooltip-template" aria-label=(t "Delete") }}
                             </div>
                         </div>
-                        <div class="message_content rendered_markdown restore-overlay-message" data-tooltip-template-id="restore-scheduled-message-tooltip-template">{{rendered_markdown rendered_content}}</div>
+                        <div class="message_content rendered_markdown restore-overlay-message">{{rendered_markdown rendered_content}}</div>
                     </div>
                 </div>
             </div>
diff --git a/web/templates/scheduled_messages_overlay.hbs b/web/templates/scheduled_messages_overlay.hbs
index da7490dcd4..0ac521d2a3 100644
--- a/web/templates/scheduled_messages_overlay.hbs
+++ b/web/templates/scheduled_messages_overlay.hbs
@@ -7,10 +7,12 @@
                     <span class="exit-sign">&times;</span>
                 </div>
                 <div class="removed-drafts">
-                    {{#tr}}
-                        Click on the pencil (<z-pencil-icon></z-pencil-icon>) icon to edit and reschedule a message.
-                        {{#*inline "z-pencil-icon"}}<i class="fa fa-pencil"></i>{{/inline}}
-                    {{/tr}}
+                    <div class="overlay-keyboard-shortcuts">
+                        {{#tr}}
+                            To edit or reschedule a message, click on it or press <z-shortcut></z-shortcut>.
+                            {{#*inline "z-shortcut"}}{{popover_hotkey_hints "Enter"}}{{/inline}}
+                        {{/tr}}
+                    </div>
                 </div>
             </div>
             <div class="scheduled-messages-list overlay-messages-list">
diff --git a/web/templates/tooltip_templates.hbs b/web/templates/tooltip_templates.hbs
index 3f512a5297..f6282a7ddb 100644
--- a/web/templates/tooltip_templates.hbs
+++ b/web/templates/tooltip_templates.hbs
@@ -249,10 +249,6 @@
     {{t "Mute topic" }}
     {{tooltip_hotkey_hints "Shift" "M"}}
 </template>
-<template id="restore-scheduled-message-tooltip-template">
-    {{t 'Edit and reschedule message' }}
-    {{tooltip_hotkey_hints "Enter"}}
-</template>
 <template id="delete-scheduled-message-tooltip-template">
     {{t 'Delete scheduled message' }}
     {{tooltip_hotkey_hints "Backspace"}}