diff --git a/web/src/message_edit.ts b/web/src/message_edit.ts
index 78c8fe006b..01a1d0ef49 100644
--- a/web/src/message_edit.ts
+++ b/web/src/message_edit.ts
@@ -340,8 +340,8 @@ export function stream_and_topic_exist_in_edit_history(
 export function hide_message_edit_spinner($row: JQuery): void {
     $row.find(".loader").hide();
     $row.find(".message_edit_save span").show();
-    $row.find(".message_edit_save").removeClass("disable-btn");
-    $row.find(".message_edit_cancel").removeClass("disable-btn");
+    $row.find(".message_edit_save").removeClass("message-edit-button-disabled");
+    $row.find(".message_edit_cancel").removeClass("message-edit-button-disabled");
 }
 
 export function show_message_edit_spinner($row: JQuery): void {
@@ -349,8 +349,8 @@ export function show_message_edit_spinner($row: JQuery): void {
     // do for send button in compose box.
     loading.show_button_spinner($row.find(".loader"), true);
     $row.find(".message_edit_save span").hide();
-    $row.find(".message_edit_save").addClass("disable-btn");
-    $row.find(".message_edit_cancel").addClass("disable-btn");
+    $row.find(".message_edit_save").addClass("message-edit-button-disabled");
+    $row.find(".message_edit_cancel").addClass("message-edit-button-disabled");
 }
 
 export function show_topic_edit_spinner($row: JQuery): void {
diff --git a/web/styles/message_row.css b/web/styles/message_row.css
index dc74d9dbcc..970c2190ff 100644
--- a/web/styles/message_row.css
+++ b/web/styles/message_row.css
@@ -746,10 +746,10 @@ of the base style defined for a read-only textarea in dark mode. */
     .btn-wrapper {
         cursor: not-allowed;
     }
+}
 
-    .disable-btn {
-        pointer-events: none;
-    }
+.message-edit-button-disabled {
+    pointer-events: none;
 }
 
 /* Reduce some of the heavy padding from Bootstrap. */