diff --git a/home/ivand/default.nix b/home/ivand/default.nix
index 49973c3..81afc3a 100644
--- a/home/ivand/default.nix
+++ b/home/ivand/default.nix
@@ -46,9 +46,13 @@
         };
       };
       rbingwp = {
+        Install = {
+          WantedBy = [ "sway-session.target" ];
+        };
         Unit = {
           Description = "Restart bingwp and wpd services";
-          After = "sway-session.target";
+          After = "graphical-session-pre.target";
+          PartOf = "graphical-session.target";
         };
         Service = {
           Type = "oneshot";