diff --git a/imports/NeoChat/Component/ChatBox/ChatBar.qml b/imports/NeoChat/Component/ChatBox/ChatBar.qml
index 19dfa080d..fb53dad1e 100644
--- a/imports/NeoChat/Component/ChatBox/ChatBar.qml
+++ b/imports/NeoChat/Component/ChatBox/ChatBar.qml
@@ -149,7 +149,7 @@ ToolBar {
                         chatBar.pasteImage();
                     } else if (event.key === Qt.Key_Up && event.modifiers & Qt.ControlModifier) {
                         replyPreviousUserMessage();
-                    } else if (event.key === Qt.Key_Up) {
+                    } else if (event.key === Qt.Key_Up && inputField.text.length === 0) {
                         editLastUserMessage();
                     }
                 }