diff --git a/web/src/compose_banner.ts b/web/src/compose_banner.ts
index 91d2f5d3ad..d4470a18e9 100644
--- a/web/src/compose_banner.ts
+++ b/web/src/compose_banner.ts
@@ -125,7 +125,7 @@ export function rewire_clear_message_sent_banners(value: typeof clear_message_se
 function hide_compose_spinner(): void {
     $(".compose-submit-button .loader").hide();
     $(".compose-submit-button span").show();
-    $(".compose-submit-button").removeClass("disable-btn");
+    $(".compose-submit-button").removeClass("compose-button-disabled");
 }
 
 export function clear_errors(): void {
diff --git a/web/src/compose_ui.ts b/web/src/compose_ui.ts
index e0bcacd778..261dcd89fe 100644
--- a/web/src/compose_ui.ts
+++ b/web/src/compose_ui.ts
@@ -1199,7 +1199,7 @@ export function hide_compose_spinner(): void {
     compose_spinner_visible = false;
     $(".compose-submit-button .loader").hide();
     $(".compose-submit-button .zulip-icon-send").show();
-    $(".compose-submit-button").removeClass("disable-btn");
+    $(".compose-submit-button").removeClass("compose-button-disabled");
 }
 
 export function show_compose_spinner(): void {
@@ -1207,7 +1207,7 @@ export function show_compose_spinner(): void {
     // Always use white spinner.
     loading.show_button_spinner($(".compose-submit-button .loader"), true);
     $(".compose-submit-button .zulip-icon-send").hide();
-    $(".compose-submit-button").addClass("disable-btn");
+    $(".compose-submit-button").addClass("compose-button-disabled");
 }
 
 export function get_compose_click_target(element: HTMLElement): Element {
diff --git a/web/styles/compose.css b/web/styles/compose.css
index 5f6a19fb9d..d4374306a3 100644
--- a/web/styles/compose.css
+++ b/web/styles/compose.css
@@ -1402,6 +1402,10 @@ textarea.new_message_textarea {
             opacity: 0.5;
         }
     }
+
+    .compose-button-disabled {
+        pointer-events: none;
+    }
 }
 
 .drag {