diff --git a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
index 25a03cc0..122a93c3 100644
--- a/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
+++ b/containments/taskpanel/package/contents/ui/TaskSwitcher.qml
@@ -91,7 +91,7 @@ NanoShell.FullScreenOverlay {
         // skip to first active task
         if (window.wasInActiveTask) {
             tasksView.currentIndex = window.model.activeTask.row;
-            tasksView.contentX = Math.max(0, Math.min(tasksView.contentWidth, window.model.activeTask.row * (tasksView.width + tasksView.spacing)));
+            tasksView.positionViewAtIndex(window.model.activeTask.row, ListView.SnapPosition);
         }
         
         window.visible = true;