diff --git a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
index 243bd4a9..91261c58 100644
--- a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
+++ b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
@@ -61,6 +61,9 @@ NanoShell.FullScreenOverlay {
         scrollAnim.running = true;
     }
     function hide() {
+        if (!window.visible) {
+            return;
+        }
         scrollAnim.from = tasksView.contentY;
         if (tasksView.contentY + tasksView.headerItem.height < tasksView.contentHeight/2) {
             scrollAnim.to = -tasksView.headerItem.height;