diff --git a/ui/app/AppLayouts/Chat/views/ChatContentView.qml b/ui/app/AppLayouts/Chat/views/ChatContentView.qml
index 34786519e4..0550f81fa9 100644
--- a/ui/app/AppLayouts/Chat/views/ChatContentView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatContentView.qml
@@ -162,6 +162,7 @@ ColumnLayout {
             onOpenStickerPackPopup: {
                 root.openStickerPackPopup(stickerPackId);
             }
+            onEditModeChanged: if (!editModeOn) chatInput.forceInputActiveFocus()
         }
 
         Item {
diff --git a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
index ede5b45f11..5641f38660 100644
--- a/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
@@ -44,6 +44,7 @@ Item {
 
     signal openStickerPackPopup(string stickerPackId)
     signal showReplyArea(string messageId, string author)
+    signal editModeChanged(bool editModeOn)
 
     QtObject {
         id: d
@@ -272,6 +273,7 @@ Item {
             sticker: model.sticker
             stickerPack: model.stickerPack
             editModeOn: model.editMode
+            onEditModeOnChanged: root.editModeChanged(editModeOn)
             isEdited: model.isEdited
             linkUrls: model.links
             messageAttachments: model.messageAttachments