diff --git a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
index 050f49b8..112a05b9 100644
--- a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
+++ b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
@@ -76,12 +76,19 @@ NanoShell.FullScreenOverlay {
         if (id < 0) {
             return;
         }
+
+        var newActiveIdx = window.model.index(id, 0)
+        var newActiveGeo = tasksModel.data(newActiveIdx, TaskManager.AbstractTasksModel.ScreenGeometry)
         for (var i = 0 ; i < tasksModel.count; i++) {
             var idx = window.model.index(i, 0)
             if (i == id) {
                 window.model.requestActivate(idx);
             } else if (!tasksModel.data(idx, TaskManager.AbstractTasksModel.IsMinimized)) {
-                tasksModel.requestToggleMinimized(idx);
+                var geo = tasksModel.data(idx, TaskManager.AbstractTasksModel.ScreenGeometry)
+                // Only minimize the other windows in the same screen
+                if (geo === newActiveGeo) {
+                    tasksModel.requestToggleMinimized(idx);
+                }
             }
         }
         activateAnim.delegate = delegate;