diff --git a/packaging/linux/sunshine-kms.service.in b/packaging/linux/sunshine-kms.service.in
index 848c17157f3..80defd58d57 100644
--- a/packaging/linux/sunshine-kms.service.in
+++ b/packaging/linux/sunshine-kms.service.in
@@ -3,6 +3,7 @@ Description=@PROJECT_DESCRIPTION@
 StartLimitIntervalSec=500
 StartLimitBurst=5
 Conflicts=sunshine.service
+After=graphical-session.target xdg-desktop-autostart.target
 
 [Service]
 # Avoid starting Sunshine before the desktop is fully initialized.
@@ -13,4 +14,4 @@ Restart=on-failure
 RestartSec=5s
 
 [Install]
-WantedBy=xdg-desktop-autostart.target
+WantedBy=graphical-session.target
diff --git a/packaging/linux/sunshine.service.in b/packaging/linux/sunshine.service.in
index 79cd391b8ab..33dd8caa927 100644
--- a/packaging/linux/sunshine.service.in
+++ b/packaging/linux/sunshine.service.in
@@ -3,6 +3,7 @@ Description=@PROJECT_DESCRIPTION@
 StartLimitIntervalSec=500
 StartLimitBurst=5
 Conflicts=sunshine-kms.service
+After=graphical-session.target xdg-desktop-autostart.target xdg-desktop-portal.service
 
 [Service]
 # Avoid starting Sunshine before the desktop is fully initialized.
@@ -14,4 +15,4 @@ RestartSec=5s
 NoNewPrivileges=true
 
 [Install]
-WantedBy=xdg-desktop-autostart.target
+WantedBy=graphical-session.target