diff --git a/hosts/common/configs/user/gui/astal/config/widget/Bar.tsx b/hosts/common/configs/user/gui/astal/config/widget/Bar.tsx
index 416565d..8996e97 100644
--- a/hosts/common/configs/user/gui/astal/config/widget/Bar.tsx
+++ b/hosts/common/configs/user/gui/astal/config/widget/Bar.tsx
@@ -20,7 +20,7 @@ function getHyprlandMonitor(gdkmonitor: Gdk.Monitor) {
   }
 }
 
-export default (monitor: Gdk.Monitor, index: number) => <window
+export default (monitor: Gdk.Monitor) => <window
   className='bar'
   gdkmonitor={monitor}
   exclusivity={Astal.Exclusivity.EXCLUSIVE}
diff --git a/hosts/common/configs/user/gui/astal/config/widget/components/Workspaces.tsx b/hosts/common/configs/user/gui/astal/config/widget/components/Workspaces.tsx
index 976771f..42595a1 100644
--- a/hosts/common/configs/user/gui/astal/config/widget/components/Workspaces.tsx
+++ b/hosts/common/configs/user/gui/astal/config/widget/components/Workspaces.tsx
@@ -3,32 +3,61 @@ import Hyprland from "gi://AstalHyprland";
 import { range } from '../../lib';
 
 const hyprland = Hyprland.get_default();
+const BLOCK_SIZE = 10;
+
+const Workspace = ({ id }: { id: number }) => {
+  let maybeWorkspace: Variable<Hyprland.Workspace | undefined>;
+  let occupied: Variable<boolean>;
+
+  try {
+    const workspace = hyprland.get_workspace(id);
+    maybeWorkspace = Variable(workspace);
+    occupied = Variable(workspace.clients.length > 0);
+  } catch (_) {
+    maybeWorkspace = Variable(undefined);
+    occupied = Variable(false);
+  }
+
+  const active = Variable.derive(
+    [bind(hyprland, "focusedWorkspace")],
+    focused => focused.id == id
+  );
+
+  hyprland.connect("workspace-added", (_, workspace) => {
+    if (workspace.id != id) return;
+    maybeWorkspace.set(workspace);
+    occupied.set(workspace.clients.length > 0);
+    workspace.connect("clients", clients => occupied.set(clients.length > 0))
+  });
+
+  hyprland.connect("workspace-removed", (_, workspaceId) => {
+    if (workspaceId != id) return;
+    maybeWorkspace.set(undefined);
+    occupied.set(false);
+  });
 
-const Workspace = ({ workspace }: { workspace: Hyprland.Workspace }) => {
   const className = Variable.derive(
-    [bind(hyprland, "focusedWorkspace"), bind(workspace, "clients")],
-    (focused, clients) => {
-      if (focused.id == workspace.id) return "button active";
-      if (clients.length > 0) return "button occupied";
+    [active, occupied],
+    (active, occupied) => {
+      if (active) return "button active";
+      if (occupied) return "button occupied";
       return "button";
-    },
+    }
   );
 
   return <box vertical>
     <box vexpand />
-    <eventbox
-      onClickRelease={() => hyprland.dispatch("workspace", `${workspace.id}`)}
-    >
-      <label
-        className={className()}
-      />
+    <eventbox onClickRelease={() => hyprland.dispatch("workspace", `${id}`)}>
+      <label className={className()} />
     </eventbox>
     <box vexpand />
   </box>;
 };
 
 export default ({ monitor }: { monitor: Hyprland.Monitor }) => {
-  const workspaces = hyprland.get_workspaces().filter(w => w.monitor.id == monitor.id).sort((w1, w2) => w1.id - w2.id);
+  const workspaces = hyprland.get_workspaces();
+  const displayWorkspaces = workspaces.filter(w => w.monitor.id === monitor.id);
+  const displayWorkspaceBlockStart = Math.floor((displayWorkspaces[0].id - 1) / BLOCK_SIZE) * 10;
 
   return <eventbox
     className="workspaces"
@@ -37,7 +66,7 @@ export default ({ monitor }: { monitor: Hyprland.Monitor }) => {
     }}
   >
     <box>
-      {workspaces.map((w) => <Workspace workspace={w} />)}
+      {range(BLOCK_SIZE).map(i => <Workspace id={displayWorkspaceBlockStart + i} />)}
     </box>
   </eventbox>;
 };
diff --git a/hosts/common/configs/user/gui/hyprland/scripts/bind.sh b/hosts/common/configs/user/gui/hyprland/scripts/bind.sh
index 8dbcf1d..4c70de3 100644
--- a/hosts/common/configs/user/gui/hyprland/scripts/bind.sh
+++ b/hosts/common/configs/user/gui/hyprland/scripts/bind.sh
@@ -1,24 +1,24 @@
-BASE_WS="$1"
+SELECTED_WORKSPACE_BASE="$1"
 ACTION="$2"
 
-current_ws_id="$(hyprctl -j activeworkspace | jq -r '.id')"
-
-ws_json="$(hyprctl -j workspaces)"
-max_ws_id="$(echo "$ws_json" | jq -r '[.[] | .id] | max')"
-
 BLOCK_SIZE=10
 
-total_blocks=$(((max_ws_id - 1) / BLOCK_SIZE + 1))
-current_block=$(((current_ws_id - 1) / BLOCK_SIZE))
-target_ws=$((current_block * BLOCK_SIZE + BASE_WS))
+current_workspace_id="$(hyprctl -j activeworkspace | jq -r '.id')"
+workspace_json="$(hyprctl -j workspaces)"
 
-if [ "$target_ws" -eq "$current_ws_id" ]; then
-  next_block=$(( (current_block + 1) % total_blocks ))
-  target_ws=$(( next_block * BLOCK_SIZE + BASE_WS ))
+max_active_workspace_id="$(echo "$workspace_json" | jq -r '[.[] | .id] | max')"
+total_blocks=$(((max_active_workspace_id - 1) / BLOCK_SIZE + 1))
+
+current_block=$(((current_workspace_id - 1) / BLOCK_SIZE))
+target_workspace_id=$((current_block * BLOCK_SIZE + SELECTED_WORKSPACE_BASE))
+
+if [ "$target_workspace_id" -eq "$current_workspace_id" ]; then
+  next_block=$(((current_block + 1) % total_blocks))
+  target_workspace_id=$((next_block * BLOCK_SIZE + SELECTED_WORKSPACE_BASE))
 fi
 
 if [ "$ACTION" = "move" ]; then
-  hyprctl dispatch movetoworkspacesilent "$target_ws"
+  hyprctl dispatch movetoworkspacesilent "$target_workspace_id"
 else
-  hyprctl dispatch workspace "$target_ws"
+  hyprctl dispatch workspace "$target_workspace_id"
 fi
diff --git a/hosts/eirene/hardware/display.nix b/hosts/eirene/hardware/display.nix
index 335cd7d..72e705b 100644
--- a/hosts/eirene/hardware/display.nix
+++ b/hosts/eirene/hardware/display.nix
@@ -24,26 +24,26 @@
         };
 
         workspace = [
-          "1, monitor:eDP-1, layoutopt:orientation:left, persistent:true"
-          "2, monitor:eDP-1, layoutopt:orientation:left, persistent:true"
-          "3, monitor:eDP-1, layoutopt:orientation:left, persistent:true"
-          "4, monitor:eDP-1, layoutopt:orientation:left, persistent:true"
-          "5, monitor:eDP-1, layoutopt:orientation:left, persistent:true"
-          "6, monitor:eDP-1, layoutopt:orientation:left, persistent:true"
-          "7, monitor:eDP-1, layoutopt:orientation:left, persistent:true"
-          "8, monitor:eDP-1, layoutopt:orientation:left, persistent:true"
-          "9, monitor:eDP-1, layoutopt:orientation:left, persistent:true"
-          "10, monitor:eDP-1, layoutopt:orientation:left, persistent:true"
-          "11, monitor:HDMI-A-1, layoutopt:orientation:center, persistent:true"
-          "12, monitor:HDMI-A-1, layoutopt:orientation:center, persistent:true"
-          "13, monitor:HDMI-A-1, layoutopt:orientation:center, persistent:true"
-          "14, monitor:HDMI-A-1, layoutopt:orientation:center, persistent:true"
-          "15, monitor:HDMI-A-1, layoutopt:orientation:center, persistent:true"
-          "16, monitor:HDMI-A-1, layoutopt:orientation:center, persistent:true"
-          "17, monitor:HDMI-A-1, layoutopt:orientation:center, persistent:true"
-          "18, monitor:HDMI-A-1, layoutopt:orientation:center, persistent:true"
-          "19, monitor:HDMI-A-1, layoutopt:orientation:center, persistent:true"
-          "20, monitor:HDMI-A-1, layoutopt:orientation:center, persistent:true"
+          "1, monitor:eDP-1, layoutopt:orientation:left"
+          "2, monitor:eDP-1, layoutopt:orientation:left"
+          "3, monitor:eDP-1, layoutopt:orientation:left"
+          "4, monitor:eDP-1, layoutopt:orientation:left"
+          "5, monitor:eDP-1, layoutopt:orientation:left"
+          "6, monitor:eDP-1, layoutopt:orientation:left"
+          "7, monitor:eDP-1, layoutopt:orientation:left"
+          "8, monitor:eDP-1, layoutopt:orientation:left"
+          "9, monitor:eDP-1, layoutopt:orientation:left"
+          "10, monitor:eDP-1, layoutopt:orientation:left"
+          "11, monitor:HDMI-A-1, layoutopt:orientation:center"
+          "12, monitor:HDMI-A-1, layoutopt:orientation:center"
+          "13, monitor:HDMI-A-1, layoutopt:orientation:center"
+          "14, monitor:HDMI-A-1, layoutopt:orientation:center"
+          "15, monitor:HDMI-A-1, layoutopt:orientation:center"
+          "16, monitor:HDMI-A-1, layoutopt:orientation:center"
+          "17, monitor:HDMI-A-1, layoutopt:orientation:center"
+          "18, monitor:HDMI-A-1, layoutopt:orientation:center"
+          "19, monitor:HDMI-A-1, layoutopt:orientation:center"
+          "20, monitor:HDMI-A-1, layoutopt:orientation:center"
         ];
       };