diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml
index 8c2fba3f550f28a7360c921a182d3cda73b8589e..2eb6239943af79f66d09fe0fe0ae64a95fcc7401 100644
--- a/resources/qml/Completer.qml
+++ b/resources/qml/Completer.qml
@@ -110,20 +110,21 @@ Popup {
             height: chooser.child.implicitHeight + 2 * popup.rowMargin
             implicitWidth: fullWidth ? popup.contentWidth : chooser.child.implicitWidth + 4
 
-            HoverHandler {
-                id: hover
-                onHoveredChanged: {
-                    if (hovered) popup.currentIndex = model.index;
-                }
-            }
+            MouseArea {
+                id: mouseArea
 
-            TapHandler {
-                onSingleTapped: {
+                anchors.fill: parent
+                hoverEnabled: true
+                onPositionChanged: popup.currentIndex = model.index
+                onClicked: {
                      popup.completionClicked(completer.completionAt(model.index));
                      if (popup.completerName == "room")
                          popup.completionSelected(model.roomid);
+                }
+                Ripple {
+                    rippleTarget: mouseArea
+                    color: Qt.rgba(Nheko.colors.base.r, Nheko.colors.base.g, Nheko.colors.base.b, 0.5)
                  }
-            }
 
             DelegateChooser {
                 id: chooser