diff --git a/.config/quickshell/ii/modules/bar/Workspaces.qml b/.config/quickshell/ii/modules/bar/Workspaces.qml
index b97727a3..9ce93239 100644
--- a/.config/quickshell/ii/modules/bar/Workspaces.qml
+++ b/.config/quickshell/ii/modules/bar/Workspaces.qml
@@ -59,16 +59,23 @@ Item {
         })
     }
 
-    // Initialize workspaceOccupied when the component is created
+    // Occupied workspace updates
     Component.onCompleted: updateWorkspaceOccupied()
-
-    // Listen for changes in Hyprland.workspaces.values
     Connections {
         target: Hyprland.workspaces
         function onValuesChanged() {
             updateWorkspaceOccupied();
         }
     }
+    Connections {
+        target: Hyprland
+        function onFocusedWorkspaceChanged() {
+            updateWorkspaceOccupied();
+        }
+    }
+    onWorkspaceGroupChanged: {
+        updateWorkspaceOccupied();
+    }
 
     implicitWidth: rowLayout.implicitWidth + rowLayout.spacing * 2
     implicitHeight: Appearance.sizes.barHeight