diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml
index 2eb6239943af79f66d09fe0fe0ae64a95fcc7401..5d3187577c47186132cdc17e4f40a65ffa0bf5a6 100644
--- a/resources/qml/Completer.qml
+++ b/resources/qml/Completer.qml
@@ -94,6 +94,13 @@ Popup {
             enabled: !Settings.mobileMode
         }
 
+        Timer {
+            id: deadTimer
+            interval: 50
+        }
+
+        onContentYChanged: deadTimer.restart()
+
         reuseItems: true
         anchors.fill: parent
         implicitWidth: fullWidth ? parent.width : contentItem.childrenRect.width
@@ -115,7 +122,7 @@ Popup {
 
                 anchors.fill: parent
                 hoverEnabled: true
-                onPositionChanged: popup.currentIndex = model.index
+                onPositionChanged: if (!listView.moving && !deadTimer.running) popup.currentIndex = model.index
                 onClicked: {
                      popup.completionClicked(completer.completionAt(model.index));
                      if (popup.completerName == "room")
@@ -125,6 +132,7 @@ Popup {
                     rippleTarget: mouseArea
                     color: Qt.rgba(Nheko.colors.base.r, Nheko.colors.base.g, Nheko.colors.base.b, 0.5)
                  }
+            }
 
             DelegateChooser {
                 id: chooser