diff --git a/modules/services/tomat.nix b/modules/services/tomat.nix
index 95189cca..8102af86 100644
--- a/modules/services/tomat.nix
+++ b/modules/services/tomat.nix
@@ -57,17 +57,19 @@ in
     systemd.user.services.tomat = {
       Unit = {
         Description = "Tomat Pomodoro server";
-        After = [ "graphical.target" ];
+        After = [ "graphical-session.target" ];
+        PartOf = [ "graphical-session.target" ];
       };
 
       Service = {
         ExecStart = "${lib.getExe cfg.package} daemon run";
         Restart = "always";
         RestartSec = 5;
+        Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
       };
 
       Install = {
-        WantedBy = [ "default.target" ];
+        WantedBy = [ "graphical-session.target" ];
       };
     };
   };
diff --git a/tests/modules/services/tomat/expected.service b/tests/modules/services/tomat/expected.service
index dce396a2..8a036c8e 100644
--- a/tests/modules/services/tomat/expected.service
+++ b/tests/modules/services/tomat/expected.service
@@ -1,11 +1,13 @@
 [Install]
-WantedBy=default.target
+WantedBy=graphical-session.target
 
 [Service]
+Environment=PATH=/home/hm-user/.nix-profile/bin
 ExecStart=@tomat@/bin/tomat daemon run
 Restart=always
 RestartSec=5
 
 [Unit]
-After=graphical.target
+After=graphical-session.target
 Description=Tomat Pomodoro server
+PartOf=graphical-session.target