diff --git a/web/templates/edited_notice.hbs b/web/templates/edited_notice.hbs
index 7e620905e6..7a0f6a58d7 100644
--- a/web/templates/edited_notice.hbs
+++ b/web/templates/edited_notice.hbs
@@ -1,13 +1,13 @@
 {{#if msg/local_edit_timestamp}}
-<div class="message_edit_notice auto-select" title="{{t 'Edited ({last_edit_timestr})' }}">
+<div class="message_edit_notice auto-select tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Edited ({last_edit_timestr})' }}">
     {{t "SAVING" }}
 </div>
 {{else if moved}}
-<div class="message_edit_notice auto-select" title="{{t 'Moved ({last_edit_timestr})' }}">
+<div class="message_edit_notice auto-select tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Moved ({last_edit_timestr})' }}">
     {{t "MOVED" }}
 </div>
 {{else}}
-<div class="message_edit_notice auto-select" title="{{t 'Edited ({last_edit_timestr})' }}">
+<div class="message_edit_notice auto-select tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Edited ({last_edit_timestr})' }}">
     {{t "EDITED" }}
 </div>
 {{/if}}