diff --git a/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml b/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml
index 4ffe7e9d..6bd7aa21 100644
--- a/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml
+++ b/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml
@@ -117,12 +117,12 @@ MouseArea {
     }
     // launch app handled by press animation
     onClicked: mouse => {
-                   if (mouse.button === Qt.RightButton) {
-                       openContextMenu();
-                   } else {
-                       launchAppRequested = true;
-                   }
-               }
+        if (mouse.button === Qt.RightButton) {
+            openContextMenu();
+        } else {
+            launchAppRequested = true;
+        }
+    }
     
     ColumnLayout {
         anchors {
diff --git a/kwin/mobiletaskswitcher/qml/Task.qml b/kwin/mobiletaskswitcher/qml/Task.qml
index 9511a948..3d3a53a7 100644
--- a/kwin/mobiletaskswitcher/qml/Task.qml
+++ b/kwin/mobiletaskswitcher/qml/Task.qml
@@ -62,6 +62,12 @@ Item {
             oldY = y;
         }
 
+        onClicked: {
+            if (!taskSwitcher.taskSwitcherState.currentlyBeingOpened) {
+                delegate.activateApp();
+            }
+        }
+
         // drag up gesture
         DragHandler {
             id: dragHandler
@@ -168,7 +174,7 @@ Item {
                 clip: true
 
                 // scale animation on press
-                property real zoomScale: tapHandler.pressed ? 0.9 : 1
+                property real zoomScale: control.pressed ? 0.9 : 1
                 Behavior on zoomScale {
                     NumberAnimation {
                         duration: 200
@@ -199,12 +205,6 @@ Item {
                             }
                         }
                     }
-
-                    TapHandler {
-                        id: tapHandler
-                        enabled: !taskSwitcher.taskSwitcherState.currentlyBeingOpened
-                        onTapped: delegate.activateApp()
-                    }
                 }
             }
         }
diff --git a/kwin/mobiletaskswitcher/qml/TaskList.qml b/kwin/mobiletaskswitcher/qml/TaskList.qml
index d7c1d736..996a0f53 100644
--- a/kwin/mobiletaskswitcher/qml/TaskList.qml
+++ b/kwin/mobiletaskswitcher/qml/TaskList.qml
@@ -69,7 +69,6 @@ MouseArea {
     }
 
     onClicked: {
-        console.log('tapped')
         // if tapped on the background, then hide
         if (!taskSwitcherState.currentlyBeingOpened) {
             taskSwitcher.hide();
@@ -77,7 +76,6 @@ MouseArea {
     }
 
     onPressedChanged: {
-        console.log('pressed')
         if (!taskSwitcherState.currentlyBeingOpened && pressed) {
             // ensure animations aren't running when finger is pressed
             taskSwitcherState.cancelAnimations();