diff --git a/web/src/tippyjs.js b/web/src/tippyjs.js
index b5090ba3e9..dd06d15774 100644
--- a/web/src/tippyjs.js
+++ b/web/src/tippyjs.js
@@ -461,7 +461,7 @@ export function initialize() {
     });
 
     delegate("body", {
-        target: "#send_later",
+        target: ".send-control-button",
         delay: LONG_HOVER_DELAY,
         placement: "top",
         appendTo: () => document.body,
diff --git a/web/templates/compose.hbs b/web/templates/compose.hbs
index 7019e636f7..a2ba2eeba5 100644
--- a/web/templates/compose.hbs
+++ b/web/templates/compose.hbs
@@ -85,7 +85,7 @@
                             <div class="drag"></div>
 
                             <div id="message-send-controls-container">
-                                <a id="compose-drafts-button" role="button" class="compose_control_button send-control-button hide-sm" tabindex=0 href="#drafts" data-tooltip-template-id="compose_draft_tooltip_template">
+                                <a id="compose-drafts-button" role="button" class="send-control-button hide-sm" tabindex=0 href="#drafts" data-tooltip-template-id="compose_draft_tooltip_template">
                                     {{t 'Drafts' }}
                                 </a>
                                 <span id="compose-limit-indicator"></span>