diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml
index 35ebe488..cb7d383f 100644
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@@ -206,9 +206,12 @@ Rectangle {
                             while (pos > -1) {
                                 var t = messageInput.getText(pos, pos + 1);
                                 console.log('"' + t + '"');
-                                if (t == '@' || t == ' ' || t == '\t') {
+                                if (t == '@') {
                                     messageInput.openCompleter(pos, "user");
                                     return ;
+                                } else if (t == ' ' || t == '\t') {
+                                    messageInput.openCompleter(pos + 1, "user");
+                                    return ;
                                 } else if (t == ':') {
                                     messageInput.openCompleter(pos, "emoji");
                                     return ;