diff --git a/ui/shared/status/StatusChatInput.qml b/ui/shared/status/StatusChatInput.qml
index 79434d46b4..cee9ef44c2 100644
--- a/ui/shared/status/StatusChatInput.qml
+++ b/ui/shared/status/StatusChatInput.qml
@@ -748,8 +748,12 @@ Rectangle {
                 anchors.rightMargin: Style.current.halfPadding
                 anchors.bottom: parent.bottom
                 visible: imageBtn2.visible
-                highlighted: chatsModel.plainText(Emoji.deparse(messageInputField.text).trim()).trim().length > 0 || isImage
-                enabled: highlighted
+                highlighted: chatsModel.plainText(Emoji.deparse(messageInputField.text)).length > 0 || isImage
+                enabled: highlighted && messageInputField.length < messageLimit
+                onClicked: function (event) {
+                    control.sendMessage(event)
+                    control.hideExtendedArea();
+                }
             }
 
             StatusIconButton {