diff --git a/ui/imports/shared/status/StatusChatInput.qml b/ui/imports/shared/status/StatusChatInput.qml
index 6db64dd0c1..ae9b7ff8be 100644
--- a/ui/imports/shared/status/StatusChatInput.qml
+++ b/ui/imports/shared/status/StatusChatInput.qml
@@ -1244,7 +1244,7 @@ Rectangle {
                             leftPadding: 0
                             padding: 0
                             Keys.onUpPressed: {
-                                if (isEdit) {
+                                if (isEdit && !activeFocus) {
                                     forceActiveFocus();
                                 } else {
                                     if (messageInputField.length === 0) {
@@ -1254,6 +1254,7 @@ Rectangle {
                                 if (emojiSuggestions.visible) {
                                     emojiSuggestions.listView.decrementCurrentIndex();
                                 }
+                                event.accepted = false
                             }
                             Keys.onPressed: {
                                 keyEvent = event;