diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml
index 7fb09684..fab5a375 100644
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@@ -176,7 +176,11 @@ Rectangle {
                     } else if (event.key == Qt.Key_Escape && popup.opened) {
                         completerTriggeredAt = -1;
                         popup.completerName = "";
+                        popup.close();
                         event.accepted = true;
+                    } else if (event.matches(StandardKey.SelectAll) && popup.opened) {
+                        completerTriggeredAt = -1;
+                        popup.completerName = "";
                         popup.close();
                     } else if (event.matches(StandardKey.InsertParagraphSeparator)) {
                         if (popup.opened) {