diff --git a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
index 7cfa80b0..ee84fb8b 100644
--- a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
+++ b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
@@ -55,7 +55,6 @@ FullScreenPanel {
         scrollAnim.from = tasksView.contentY;
         scrollAnim.to = 0;
         scrollAnim.running = true;
-        plasmoid.nativeInterface.requestShowingDesktop(true);
     }
     function hide() {
         scrollAnim.from = tasksView.contentY;
@@ -200,8 +199,8 @@ FullScreenPanel {
         iconSource: "go-home"
         onClicked: {
             currentTaskIndex = -1;
-            plasmoid.nativeInterface.requestShowingDesktop(true);
             window.hide();
+            plasmoid.nativeInterface.showDesktop = true;
         }
     }
 }
diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml
index 5f29ab76..17f40e08 100644
--- a/containments/taskpanel/package/contents/ui/main.qml
+++ b/containments/taskpanel/package/contents/ui/main.qml
@@ -104,6 +104,7 @@ PlasmaCore.ColorScope {
                 enabled: taskSwitcher.tasksCount > 0;
                 iconSource: "window-list"
                 onClicked: {
+                    plasmoid.nativeInterface.showDesktop = false;
                     taskSwitcher.visible ? taskSwitcher.hide() : taskSwitcher.show();
                 }
                 onPressed: mainMouseArea.managePressed(mouse);
@@ -120,11 +121,8 @@ PlasmaCore.ColorScope {
                 enabled: taskSwitcher.tasksCount > 0
                 checkable: true
                 onCheckedChanged: {
-                    if (checked) {
-                        root.taskSwitcher.setSingleActiveWindow(-1);
-                    } else {
-                        root.taskSwitcher.setSingleActiveWindow(root.taskSwitcher.currentTaskIndex);
-                    }
+                    taskSwitcher.hide();
+                    plasmoid.nativeInterface.showDesktop = checked;
                 }
                 onPressed: mainMouseArea.managePressed(mouse);
                 onPositionChanged: mainMouseArea.positionChanged(mouse);
diff --git a/containments/taskpanel/package/metadata.desktop b/containments/taskpanel/package/metadata.desktop
index a49dbec6..9fd5f970 100644
--- a/containments/taskpanel/package/metadata.desktop
+++ b/containments/taskpanel/package/metadata.desktop
@@ -6,6 +6,7 @@ Type=Service
 
 X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 X-Plasma-API=declarativeappletscript
+X-KDE-Library=plasma_containment_phone_taskpanel
 X-KDE-PluginInfo-Author=Marco Martin
 X-KDE-PluginInfo-Category=Containments
 X-KDE-PluginInfo-Email=mart@kde.org
diff --git a/containments/taskpanel/taskpanel.cpp b/containments/taskpanel/taskpanel.cpp
index 9b2b0bfc..2f81b461 100644
--- a/containments/taskpanel/taskpanel.cpp
+++ b/containments/taskpanel/taskpanel.cpp
@@ -50,6 +50,7 @@ TaskPanel::~TaskPanel()
 
 void TaskPanel::requestShowingDesktop(bool showingDesktop)
 {
+    qWarning()<<"AAAA"<<showingDesktop<<m_windowManagement;
     if (!m_windowManagement) {
         return;
     }