diff --git a/containments/taskpanel/package/contents/ui/Button.qml b/containments/taskpanel/package/contents/ui/Button.qml
index 1a01cd2f..0acedb15 100644
--- a/containments/taskpanel/package/contents/ui/Button.qml
+++ b/containments/taskpanel/package/contents/ui/Button.qml
@@ -43,6 +43,4 @@ MouseArea {
             checked = !checked;
         }
     }
-    onPositionChanged: mainMouseArea.positionChanged(mouse);
-    onReleased: mainMouseArea.released(mouse);
 }
diff --git a/containments/taskpanel/package/contents/ui/Task.qml b/containments/taskpanel/package/contents/ui/Task.qml
index 3f8b844a..84e5a697 100644
--- a/containments/taskpanel/package/contents/ui/Task.qml
+++ b/containments/taskpanel/package/contents/ui/Task.qml
@@ -115,7 +115,7 @@ Item {
                 onPressed: delegate.z = 10;
                 onClicked: {
                     window.hide();
-                    plasmoid.nativeInterface.windowModel.requestActivate(filteredWindowModel.mapRowToSource(model.index));
+                    window.setSingleActiveWindow(model.index);
                 }
                 onReleased: {
                     delegate.z = 0;
diff --git a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
index 207dbd81..27b34141 100644
--- a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
+++ b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
@@ -69,7 +69,8 @@ FullScreenPanel {
             task = filteredWindowModel.get(i);
 
             if (i == id && task.IsMinimized) {
-                plasmoid.nativeInterface.windowModel.requestToggleMinimized(filteredWindowModel.mapRowToSource(i));
+                //plasmoid.nativeInterface.windowModel.requestToggleMinimized(filteredWindowModel.mapRowToSource(i));
+                plasmoid.nativeInterface.windowModel.requestActivate(filteredWindowModel.mapRowToSource(i));
             } else if (i != id && !task.IsMinimized) {
                 plasmoid.nativeInterface.windowModel.requestToggleMinimized(filteredWindowModel.mapRowToSource(i));
             } 
@@ -204,6 +205,7 @@ FullScreenPanel {
         }
         iconSource: "go-home"
         onClicked: {
+            setSingleActiveWindow(-1);
             window.hide();
         }
     }
diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml
index 4c59069d..12a77355 100644
--- a/containments/taskpanel/package/contents/ui/main.qml
+++ b/containments/taskpanel/package/contents/ui/main.qml
@@ -88,6 +88,8 @@ PlasmaCore.ColorScope {
                 enabled: taskSwitcher.tasksCount > 0
                 iconSource: "window-list"
                 onClicked: taskSwitcher.visible ? taskSwitcher.hide() : taskSwitcher.show();
+                onPositionChanged: mainMouseArea.positionChanged(mouse);
+                onReleased: mainMouseArea.released(mouse);
             }
 
             Button {
@@ -104,10 +106,12 @@ PlasmaCore.ColorScope {
                         root.taskSwitcher.setSingleActiveWindow(Math.max(0, root.taskSwitcher.currentTaskIndex));
                     }
                 }
+                onPositionChanged: mainMouseArea.positionChanged(mouse);
+                onReleased: mainMouseArea.released(mouse);
                 Connections {
                     target: root.taskSwitcher
                     onCurrentTaskIndexChanged: {
-                        showDesktopButton.checked = root.taskSwitcher.currentTaskIndex >= 0
+                        showDesktopButton.checked = root.taskSwitcher.currentTaskIndex < 0
                     }
                 }
             }
@@ -119,6 +123,8 @@ PlasmaCore.ColorScope {
                 iconSource: "window-close"
                 enabled: plasmoid.nativeInterface.hasCloseableActiveWindow;
                 onClicked: plasmoid.nativeInterface.closeActiveWindow();
+                onPositionChanged: mainMouseArea.positionChanged(mouse);
+                onReleased: mainMouseArea.released(mouse);
             }
         }
     }