diff --git a/containments/taskpanel/package/contents/ui/Task.qml b/containments/taskpanel/package/contents/ui/Task.qml
index ed518cd8..ff8f3347 100644
--- a/containments/taskpanel/package/contents/ui/Task.qml
+++ b/containments/taskpanel/package/contents/ui/Task.qml
@@ -132,8 +132,11 @@ Item {
                 }
                 onPressed: delegate.z = 10;
                 onClicked: {
-                    //window.hide();
-                    window.setSingleActiveWindow(model.index, delegate);
+                    if (model.IsActive) {
+                        window.hide();
+                    } else {
+                        window.setSingleActiveWindow(model.index, delegate);
+                    }
                 }
                 onReleased: {
                     delegate.z = 0;