diff --git a/web/src/message_edit.js b/web/src/message_edit.js
index 4b324f05f2..a4ffb0f5fd 100644
--- a/web/src/message_edit.js
+++ b/web/src/message_edit.js
@@ -522,6 +522,7 @@ function edit_message($row, raw_content) {
         // I believe this needs to be defined outside the countdown_timer, since
         // row just refers to something like the currently selected message, and
         // can change out from under us
+        const $message_edit_save_container = $row.find(".message_edit_save_container");
         const $message_edit_save = $row.find("button.message_edit_save");
         // Do this right away, rather than waiting for the timer to do its first update,
         // since otherwise there is a noticeable lag
@@ -530,12 +531,13 @@ function edit_message($row, raw_content) {
             seconds_left -= 1;
             if (seconds_left <= 0) {
                 clearInterval(countdown_timer);
-                $message_edit_content.prop("readonly", "readonly");
                 // We don't go directly to a "TOPIC_ONLY" type state (with an active Save button),
                 // since it isn't clear what to do with the half-finished edit. It's nice to keep
                 // the half-finished edit around so that they can copy-paste it, but we don't want
                 // people to think "Save" will save the half-finished edit.
-                $message_edit_save.addClass("disabled");
+                $message_edit_save.prop("disabled", true);
+                $message_edit_save_container.addClass("tippy-zulip-tooltip");
+                $message_edit_countdown_timer.addClass("expired");
                 $message_edit_countdown_timer.text($t({defaultMessage: "Time's up!"}));
             } else {
                 $message_edit_countdown_timer.text(timer_text(seconds_left));
diff --git a/web/styles/zulip.css b/web/styles/zulip.css
index b5b70c3032..083ca8f858 100644
--- a/web/styles/zulip.css
+++ b/web/styles/zulip.css
@@ -1777,6 +1777,10 @@ div.focused_table {
     text-align: right;
     display: inline;
     color: hsl(0deg 0% 63%);
+
+    &.expired {
+        color: hsl(4deg 58% 33%);
+    }
 }
 
 .message_edit_tooltip {
diff --git a/web/templates/message_edit_form.hbs b/web/templates/message_edit_form.hbs
index eb4c327e42..824ce96327 100644
--- a/web/templates/message_edit_form.hbs
+++ b/web/templates/message_edit_form.hbs
@@ -14,7 +14,8 @@
         <div class="message_edit_spinner"></div>
         <div class="controls edit-controls">
             {{#if is_editable}}
-                <div class="btn-wrapper inline-block">
+                <div class="btn-wrapper inline-block message_edit_save_container"
+                  data-tippy-content="{{t 'You can no longer save changes to this message.' }}">
                     <button type="button" class="button small rounded sea-green message_edit_save">
                         <img class="loader" alt="" src="" />
                         <span>{{t "Save" }}</span>