1 files changed, 7 insertions, 16 deletions
diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml
index cd5ce35..0416dfd 100644
--- a/modules/bar/components/workspaces/ActiveIndicator.qml
+++ b/modules/bar/components/workspaces/ActiveIndicator.qml
@@ -11,27 +11,18 @@ StyledRect {
     required property Repeater workspaces
     required property Item mask
 
-    readonly property int currentWsIdx: {
-        let wss = Hypr.workspaces.values;
-        for (let i = 0; i < wss.length; i++) {
-            let ws = wss[i];
-            if (ws.id == activeWsId)
-                return i;
+    readonly property var currentWs: {
+        for (let i = 0; i < workspaces.count; i++) {
+            const ws = workspaces.itemAt(i);
+            if (ws && ws.isActive)
+                return ws;
         }
     }
 
-    property real currentSize: workspaces.itemAt(currentWsIdx)?.size ?? 0
-    property real offset: workspaces.itemAt(currentWsIdx)?.y ?? 0
+    property real currentSize: currentWs?.size ?? 0
+    property real offset: currentWs?.y ?? 0
     property real size: Config.bar.sizes.innerWidth - Appearance.padding.small * 2
 
-    property int cWs
-    property int lastWs
-
-    onCurrentWsIdxChanged: {
-        lastWs = cWs;
-        cWs = currentWsIdx;
-    }
-
     clip: true
     y: offset + mask.y
     implicitWidth: size