diff --git a/data/gnome-shell-wayland.service.in b/data/gnome-shell-wayland.service.in
index 04f94af2d64e375cdd7d2def78885d6ff60a2313..71c2ef1f8666c482088cb10846d76f523ec32da3 100644
--- a/data/gnome-shell-wayland.service.in
+++ b/data/gnome-shell-wayland.service.in
@@ -13,6 +13,8 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target
 
+PartOf=gnome-shell-wayland.target
+
 # The units already conflict because they use the same BusName
 #Conflicts=gnome-shell-x11.service
 
diff --git a/data/gnome-shell-x11.service.in b/data/gnome-shell-x11.service.in
index a10c33d29d6f04f431c38a59699ca2d2273f8989..c65363edb716c7c06695d607b71177c1b98672a8 100644
--- a/data/gnome-shell-x11.service.in
+++ b/data/gnome-shell-x11.service.in
@@ -13,6 +13,8 @@ Requisite=gnome-session-initialized.target
 PartOf=gnome-session-initialized.target
 Before=gnome-session-initialized.target
 
+PartOf=gnome-shell-x11.target
+
 # The units already conflict because they use the same BusName
 #Conflicts=gnome-shell-wayland.service
 
@@ -29,5 +31,5 @@ SuccessExitStatus=1
 Restart=always
 # Do not wait before restarting the shell
 RestartSec=0ms
-# Kill any stubborn child processes after this long
-TimeoutStopSec=5
+# Do not kill subprocesses (non-bus-activated apps launched by the user)
+KillMode=process