diff --git a/modules/Bar.qml b/modules/Bar.qml
index 2f8402b..9f28199 100644
--- a/modules/Bar.qml
+++ b/modules/Bar.qml
@@ -138,7 +138,6 @@ PanelWindow {
                 leftEdge: !workspacesGroup.visible
                 M.Tray {
                     bar: bar
-                    visible: M.Modules.tray.enable
                 }
             }
             M.BarGroup {
diff --git a/modules/Tray.qml b/modules/Tray.qml
index 317378d..de89254 100644
--- a/modules/Tray.qml
+++ b/modules/Tray.qml
@@ -9,6 +9,7 @@ import "." as M
 RowLayout {
     id: root
     spacing: M.Theme.moduleSpacing + 2
+    visible: M.Modules.tray.enable && SystemTray.items.length > 0
 
     required property var bar
     property var _activeMenu: null