diff --git a/de/home/.config/eww/eww.scss b/de/home/.config/eww/eww.scss
index eff3ba7..a4df91d 100644
--- a/de/home/.config/eww/eww.scss
+++ b/de/home/.config/eww/eww.scss
@@ -59,7 +59,7 @@ $bar-module-border-radius: 8px;
     padding: 0px 5px;
   }
 }
-.workspaces>button {
+.workspaces>box>box>button {
   margin: 5px 0px;
   background-color: $bar-module-bg-color;
   border: 1px solid $bar-module-fg-color;
diff --git a/de/home/.config/eww/modules/bar/workspaces.yuck b/de/home/.config/eww/modules/bar/workspaces.yuck
index 2af759a..ab70a3d 100644
--- a/de/home/.config/eww/modules/bar/workspaces.yuck
+++ b/de/home/.config/eww/modules/bar/workspaces.yuck
@@ -11,8 +11,14 @@
   (for entry in array
 ;    {entry.focused ? (workspace :ws entry) : ""})))
 ;    (for ws in {}
-    (literal
-      :content {entry.focused ? "(workspace :ws entry)" : ""}))))
+    (box
+      (literal
+        :content {(entry.num < jq(array, '.. | select(.type?) | select(.focused==true).num')) ? "(workspace :ws entry)" : "(box :visible false)"})
+      (literal
+        :content {entry.focused ? "(workspace :ws entry)" : "(box :visible false)"})
+      (literal
+        :content {(entry.num > jq(array, '.. | select(.type?) | select(.focused==true).num')) ? "(workspace :ws entry)" : "(box :visible false)"})))))
+
 ;;    {entry.focused ? "${entry.num}" : ""})))
 ;    (button :onclick `swaymsg workspace "${entry.name}"`
 ;      :class {entry.focused ? "focused" : ""}