diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml
index 750a0fdd..27322172 100644
--- a/resources/qml/Completer.qml
+++ b/resources/qml/Completer.qml
@@ -85,7 +85,7 @@ Popup {
 
                 anchors.fill: parent
                 hoverEnabled: true
-                onEntered: popup.currentIndex = model.index
+                onPositionChanged: popup.currentIndex = model.index
                 onClicked: popup.completionClicked(completer.completionAt(model.index))
 
                 Ripple {
diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml
index 138a9ab6..35ebe488 100644
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@@ -164,7 +164,8 @@ Rectangle {
                         event.accepted = true;
                     } else if (event.key == Qt.Key_Space) {
                         if (popup.opened && popup.count <= 0)
-                            popup.close()
+                            popup.close();
+
                     } else if (event.modifiers == Qt.ControlModifier && event.key == Qt.Key_U) {
                         messageInput.clear();
                     } else if (event.modifiers == Qt.ControlModifier && event.key == Qt.Key_P) {
@@ -258,7 +259,7 @@ Rectangle {
 
                 Connections {
                     ignoreUnknownSignals: true
-                    onReplyChanged: messageInput.forceActiveFocus();
+                    onReplyChanged: messageInput.forceActiveFocus()
                     target: TimelineManager.timeline
                 }