diff --git a/imports/NeoChat/Component/ChatBox/ChatBar.qml b/imports/NeoChat/Component/ChatBox/ChatBar.qml
index 7dc36b322..066fc6be2 100644
--- a/imports/NeoChat/Component/ChatBox/ChatBar.qml
+++ b/imports/NeoChat/Component/ChatBox/ChatBar.qml
@@ -113,7 +113,7 @@ ToolBar {
                     onTriggered: currentRoom.sendTypingNotification(true)
                 }
 
-                Keys.onReturnPressed: {
+                function sendMessage(event) {
                     if (isCompleting) {
                         chatBar.complete();
 
@@ -127,6 +127,9 @@ ToolBar {
                     }
                 }
 
+                Keys.onReturnPressed: { sendMessage(event) }
+                Keys.onEnterPressed: { sendMessage(event) }
+
                 Keys.onEscapePressed: {
                     closeAllTriggered()
                 }