diff --git a/dist/converse.js b/dist/converse.js
index 9c92e00c9..aaa08fbe9 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -50271,8 +50271,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_5__["default"].plugins
         if (this.parseMessageForCommands(message) || (await this.model.sendMessage(this.model.getOutgoingMessageAttributes(message, spoiler_hint)))) {
           hint_el.value = '';
           textarea.value = '';
-          _converse_headless_utils_emoji__WEBPACK_IMPORTED_MODULE_21__["default"].removeClass('correcting', textarea);
-          textarea.focus(); // Trigger input event, so that the textarea resizes
+          _converse_headless_utils_emoji__WEBPACK_IMPORTED_MODULE_21__["default"].removeClass('correcting', textarea); // Trigger input event, so that the textarea resizes
 
           const event = document.createEvent('Event');
           event.initEvent('input', true, true);
@@ -50281,7 +50280,8 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_5__["default"].plugins
           _converse.emit('messageSend', message);
         }
 
-        textarea.removeAttribute('disabled'); // Suppress events, otherwise superfluous CSN gets set
+        textarea.removeAttribute('disabled');
+        textarea.focus(); // Suppress events, otherwise superfluous CSN gets set
         // immediately after the message, causing rate-limiting issues.
 
         this.setChatState(_converse.ACTIVE, {
diff --git a/src/converse-chatview.js b/src/converse-chatview.js
index 036e373cb..4760277eb 100644
--- a/src/converse-chatview.js
+++ b/src/converse-chatview.js
@@ -874,11 +874,9 @@ converse.plugins.add('converse-chatview', {
                 textarea.setAttribute('disabled', 'disabled');
                 if (this.parseMessageForCommands(message) ||
                     await this.model.sendMessage(this.model.getOutgoingMessageAttributes(message, spoiler_hint))) {
-
                     hint_el.value = '';
                     textarea.value = '';
                     u.removeClass('correcting', textarea);
-                    textarea.focus();
                     // Trigger input event, so that the textarea resizes
                     const event = document.createEvent('Event');
                     event.initEvent('input', true, true);
@@ -886,6 +884,7 @@ converse.plugins.add('converse-chatview', {
                     _converse.emit('messageSend', message);
                 }
                 textarea.removeAttribute('disabled');
+                textarea.focus();
                 // Suppress events, otherwise superfluous CSN gets set
                 // immediately after the message, causing rate-limiting issues.
                 this.setChatState(_converse.ACTIVE, {'silent': true});