diff --git a/users/simon/modules/sway/waybar.nix b/users/simon/modules/sway/waybar.nix
index f5107c0..f1015b5 100644
--- a/users/simon/modules/sway/waybar.nix
+++ b/users/simon/modules/sway/waybar.nix
@@ -287,4 +287,15 @@ in
       RestartSec = "1s";
     };
   };
+
+  # TODO: remove when https://github.com/nix-community/home-manager/issues/2064
+  # is resolved
+  systemd.user.targets.tray = {
+    Unit = {
+      Description = "Home Manager System Tray";
+      Requires = [ "graphical-session-pre.target" ];
+    };
+  };
+
+  services.blueman-applet.enable = lib.mkIf nixosConfig.sbruder.full true;
 }