diff --git a/modules/bar/Tray.qml b/modules/bar/Tray.qml
index 9b2337a..f3d0919 100644
--- a/modules/bar/Tray.qml
+++ b/modules/bar/Tray.qml
@@ -11,6 +11,7 @@ import qs.widgets
 WrapperRectangle {
     id: root
     color: Colors.base01
+    visible: iconRepeater.count != 0
     required property int barHeight
     property double vertMargin: barHeight / 4 - 4
     topMargin: vertMargin
diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml
index 9b9ff61..8135c87 100644
--- a/modules/bar/Ws.qml
+++ b/modules/bar/Ws.qml
@@ -12,19 +12,22 @@ WrapperRectangle {
     required property ShellScreen barScreen
     required property int barHeight
     readonly property double vertMargin: barHeight / 4 - 4
+                property HyprlandMonitor hyprBarScreen: Hyprland.monitorFor(root.barScreen)
     color: Colors.base01
     topMargin: vertMargin
     bottomMargin: vertMargin
     leftMargin: 8
     rightMargin: 8
-    RowLayout {
+    child: RowLayout {
+        id: wsLayout
         Repeater {
             id: wsRepeater
             model: Hyprland.workspaces
             delegate: WrapperRectangle {
                 id: wsWrapper
+                parent: wsLayout
                 color: 'transparent'
-                visible: modelData.monitor == Hyprland.monitorFor(root.barScreen)
+                visible: modelData.monitor == root.hyprBarScreen
                 required property var modelData
                 child: StyledText {
                     text: wsWrapper.modelData.id