diff --git a/foot-server.service.in b/foot-server.service.in
index 47b81267..a9447253 100644
--- a/foot-server.service.in
+++ b/foot-server.service.in
@@ -8,6 +8,7 @@ Requires=%N.socket
 Description=Foot terminal server mode
 Documentation=man:foot(1)
 PartOf=graphical-session.target
+After=graphical-session.target
 
 [Install]
 WantedBy=graphical-session.target
diff --git a/foot-server.socket b/foot-server.socket
index 997e4363..0c7c1b8f 100644
--- a/foot-server.socket
+++ b/foot-server.socket
@@ -3,6 +3,7 @@ ListenStream=%t/foot.sock
 
 [Unit]
 PartOf=graphical-session.target
+After=graphical-session.target
 ConditionEnvironment=WAYLAND_DISPLAY
 
 [Install]