diff --git a/modules/user/modules/quickshell/shell/bar/Workspaces.qml b/modules/user/modules/quickshell/shell/bar/Workspaces.qml
index 14e2ab3..4288715 100644
--- a/modules/user/modules/quickshell/shell/bar/Workspaces.qml
+++ b/modules/user/modules/quickshell/shell/bar/Workspaces.qml
@@ -31,7 +31,7 @@ FullwidthMouseArea {
 
     if (offset != 0) {
       const targetWorkspace = currentIndex + offset;
-      const id = Math.max(1, Math.min(10, targetWorkspace));
+      const id = Math.max(wsBaseIndex, Math.min(wsBaseIndex + 9, targetWorkspace));
       if (id != currentIndex) Hyprland.dispatch(`workspace ${id}`);
     }
   }