diff --git a/systemd/tray-apps/tray-apps.target b/systemd/tray-apps/tray-apps.target
index 921f054..eef0d58 100644
--- a/systemd/tray-apps/tray-apps.target
+++ b/systemd/tray-apps/tray-apps.target
@@ -3,6 +3,7 @@ Description=Auto-starting apps for graphical sessions
 Documentation=man:systemd.target(5)
 StopWhenUnneeded=yes
 After=graphical-session.target
+StopPropagatedFrom=graphical-session.target
 
 [Install]
 WantedBy=graphical-session.target
diff --git a/systemd/waybar.service b/systemd/waybar.service
index fc0eeb1..5e285cb 100644
--- a/systemd/waybar.service
+++ b/systemd/waybar.service
@@ -5,6 +5,8 @@ PartOf=graphical-session.target
 After=graphical-session.target
 
 [Service]
+Type=dbus
+BusName=fr.arouillard.waybar
 ExecStart=%h/.local/bin/waybar -c %h/.config/river/waybar/config.jsonc -s %h/.config/river/waybar/style.css
 ExecReload=kill -SIGUSR2 $MAINPID
 Restart=on-failure