diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatButtons.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatButtons.qml
index 12bba63554..b96b0d7a0f 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatButtons.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatButtons.qml
@@ -25,13 +25,14 @@ Item {
         onClicked: {
             if(chatColumn.isImage){
                 chatsModel.sendImage(sendImageArea.image);
-                chatColumn.hideExtendedArea();
             }
 
             if(txtData.text.trim() > 0){
                 chatsModel.sendMessage(txtData.text, chatColumn.isReply ? SelectedMessage.messageId : "")
                 txtData.text = "";
             }
+
+            chatColumn.hideExtendedArea();
         }
         background: Rectangle {
             color: parent.enabled ? Style.current.blue : Style.current.grey
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml
index 7118722ddd..fcbb9eb5c2 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatInput.qml
@@ -37,7 +37,6 @@ Rectangle {
         if (event.modifiers === Qt.NoModifier && (event.key === Qt.Key_Enter || event.key === Qt.Key_Return)) {
             if(chatColumn.isImage){
                 chatsModel.sendImage(sendImageArea.image);
-                chatColumn.hideExtendedArea();
             }
 
             if(txtData.text.trim().length > 0){
@@ -48,6 +47,7 @@ Rectangle {
                 sendMessageSound.stop()
                 Qt.callLater(sendMessageSound.play);
             }
+            chatColumn.hideExtendedArea();
         }
     }