diff --git a/web/src/drafts_overlay_ui.ts b/web/src/drafts_overlay_ui.ts
index 8bde3e05d6..ec7f4b6704 100644
--- a/web/src/drafts_overlay_ui.ts
+++ b/web/src/drafts_overlay_ui.ts
@@ -387,7 +387,6 @@ export function launch(): void {
     messages_overlay_ui.set_initial_element(first_element_id, keyboard_handling_context);
     setup_event_handlers();
     setup_bulk_actions_handlers();
-    messages_overlay_ui.initialize_restore_overlay_message_tooltip();
 }
 
 export function update_bulk_delete_ui(): void {
diff --git a/web/styles/settings.css b/web/styles/settings.css
index 1a02bf45b5..ec61d6881c 100644
--- a/web/styles/settings.css
+++ b/web/styles/settings.css
@@ -582,6 +582,11 @@ input[type="checkbox"] {
     margin: 0 2px;
 }
 
+.overlay-keyboard-shortcuts .popover-menu-hotkey-hints {
+    display: inline-flex;
+    padding-left: 0;
+}
+
 .edit-attachment-buttons {
     display: inline-block;
     vertical-align: middle;
diff --git a/web/templates/draft.hbs b/web/templates/draft.hbs
index 7d8ae30cbd..4b0ebb4c2d 100644
--- a/web/templates/draft.hbs
+++ b/web/templates/draft.hbs
@@ -50,14 +50,13 @@
                             <span class="copy-button copy-overlay-message tippy-zulip-delayed-tooltip" data-draft-id="{{draft_id}}" data-tippy-content="{{t 'Copy draft' }}" aria-label="{{t 'Copy draft' }}" role="button">
                                 <i class="zulip-icon zulip-icon-copy" aria-hidden="true"></i>
                             </span>
-                            <i class="fa fa-pencil fa-lg restore-overlay-message tippy-zulip-delayed-tooltip" aria-hidden="true" data-tooltip-template-id="restore-draft-tooltip-template"></i>
                             {{> ./components/icon_button intent="danger" custom_classes="delete-overlay-message tippy-zulip-delayed-tooltip" icon="trash" data-tooltip-template-id="delete-draft-tooltip-template" aria-label=(t "Delete") }}
                             <div class="draft-selection-tooltip">
                                 <i class="fa fa-square-o fa-lg draft-selection-checkbox" aria-hidden="true"></i>
                             </div>
                         </div>
                     </div>
-                    <div class="message_content rendered_markdown restore-overlay-message" data-tooltip-template-id="restore-draft-tooltip-template">{{rendered_markdown content}}</div>
+                    <div class="message_content rendered_markdown restore-overlay-message">{{rendered_markdown content}}</div>
                 </div>
             </div>
         </div>
diff --git a/web/templates/draft_table_body.hbs b/web/templates/draft_table_body.hbs
index 6010071d07..861b98104e 100644
--- a/web/templates/draft_table_body.hbs
+++ b/web/templates/draft_table_body.hbs
@@ -9,7 +9,13 @@
                 <div id="draft_overlay_banner_container" class="banner-container"></div>
                 <div class="header-body">
                     <div class="drafts-header-note">
-                        {{t "Drafts are not synced to other devices and browsers." }}
+                        <div class="overlay-keyboard-shortcuts">
+                            {{#tr}}
+                                To restore a draft, click on it or press <z-shortcut></z-shortcut>.
+                                {{#*inline "z-shortcut"}}{{popover_hotkey_hints "Enter"}}{{/inline}}
+                            {{/tr}}
+                        </div>
+                        <div>{{t "Drafts are not synced to other devices and browsers." }}</div>
                     </div>
                     <div class="delete-drafts-group">
                         <div class="delete-selected-drafts-button-container">
diff --git a/web/templates/tooltip_templates.hbs b/web/templates/tooltip_templates.hbs
index ed3817676b..3f512a5297 100644
--- a/web/templates/tooltip_templates.hbs
+++ b/web/templates/tooltip_templates.hbs
@@ -94,10 +94,6 @@
     {{t 'Delete draft' }}
     {{tooltip_hotkey_hints "Backspace"}}
 </template>
-<template id="restore-draft-tooltip-template">
-    {{t 'Restore draft' }}
-    {{tooltip_hotkey_hints "Enter"}}
-</template>
 <template id="gear-menu-tooltip-template">
     {{t 'Main menu' }}
     {{tooltip_hotkey_hints "G"}}
diff --git a/web/tests/drafts.test.cjs b/web/tests/drafts.test.cjs
index a35af9f8a6..6a68262371 100644
--- a/web/tests/drafts.test.cjs
+++ b/web/tests/drafts.test.cjs
@@ -10,7 +10,6 @@ const $ = require("./lib/zjquery.cjs");
 const user_pill = mock_esm("../src/user_pill");
 const settings_data = mock_esm("../src/settings_data");
 const messages_overlay_ui = mock_esm("../src/messages_overlay_ui");
-messages_overlay_ui.initialize_restore_overlay_message_tooltip = noop;
 
 const people = zrequire("people");
 const compose_state = zrequire("compose_state");