diff --git a/imports/NeoChat/Component/ChatBox/ChatBar.qml b/imports/NeoChat/Component/ChatBox/ChatBar.qml
index 62e0df1e1..31db77410 100644
--- a/imports/NeoChat/Component/ChatBox/ChatBar.qml
+++ b/imports/NeoChat/Component/ChatBox/ChatBar.qml
@@ -139,17 +139,14 @@ ToolBar {
                 }
 
                 function sendMessage(event) {
-                    if (isCompleting) {
+                    if (isCompleting && completionMenu.count > 0) {
                         chatBar.complete();
-
-                        isCompleting = false;
-                        return;
-                    }
-                    if (event.modifiers & Qt.ShiftModifier) {
+                    } else if (event.modifiers & Qt.ShiftModifier) {
                         inputField.insert(cursorPosition, "\n")
                     } else {
                         chatBar.postMessage()
                     }
+                    isCompleting = false;
                 }
 
                 Keys.onReturnPressed: { sendMessage(event) }