1 files changed, 3 insertions, 1 deletions

diff --git a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
index 2d3aca1b..3ae94346 100644
--- a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
+++ b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
@@ -7,6 +7,8 @@ import QtQuick.Layouts
 Row {
   id: workspaces
 
+  required property var screen
+
   property var ignoreWorkspaces: @ignore_workspaces@
 
   height: parent.height
@@ -18,7 +20,7 @@ Row {
       values: {
         let currWorkspaces = NiriService.workspaces;
         const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
-        currWorkspaces = currWorkspaces.filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
+        currWorkspaces = currWorkspaces.filter(ws => ws.output == workspaces.screen.name).filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
         currWorkspaces.sort((a, b) => {
           if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
             return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x