diff --git a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
index a9b8dc30..5b41dc16 100644
--- a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
+++ b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
@@ -138,6 +138,11 @@ FullScreenPanel {
             filterRole: "SkipTaskbar"
             filterRegExp: "false"
             sourceModel: plasmoid.nativeInterface.windowModel
+            onCountChanged: {
+                if (count == 0) {
+                    window.hide();
+                }
+            }
         }
 
         model: filteredWindowModel