diff --git a/applets/activities/contents/ui/main.qml b/applets/activities/contents/ui/main.qml
index c780816e..e5ac9a0d 100644
--- a/applets/activities/contents/ui/main.qml
+++ b/applets/activities/contents/ui/main.qml
@@ -31,13 +31,16 @@ ColumnLayout {
         model: Activities.ActivityModel {
             id: activityModel
         }
-        highlight: PlasmaComponents.Highlight {}
         delegate: MouseArea {
                 id: delegate
                 drag {
-                    target: delegate
+                    target: listView.count > 0  && !model.current? delegate : null
                     axis: Drag.XAxis
                 }
+                PlasmaComponents.Highlight {
+                    visible: model.current
+                    anchors.fill:parent
+                }
                 SequentialAnimation {
                     id: positionAnim
                     property alias to: xAnim.to