diff --git a/zephyr/static/js/composebox_typeahead.js b/zephyr/static/js/composebox_typeahead.js
index a9206d8548..cc59955500 100644
--- a/zephyr/static/js/composebox_typeahead.js
+++ b/zephyr/static/js/composebox_typeahead.js
@@ -104,7 +104,10 @@ function handle_keydown(e) {
                 && code === 13 && !e.shiftKey
                 && enter_sends) {
                 e.preventDefault();
-                compose.finish();
+                if ($("#compose-send-button").attr('disabled') !== "disabled") {
+                    $("#compose-send-button").attr('disabled', 'disabled');
+                    compose.finish();
+                }
             }
         }