diff --git a/data/gnome-shell-wayland.service.in b/data/gnome-shell-wayland.service.in
index 351571c7f..04f94af2d 100644
--- a/data/gnome-shell-wayland.service.in
+++ b/data/gnome-shell-wayland.service.in
@@ -23,3 +23,5 @@ ExecStart=@bindir@/gnome-shell
 SuccessExitStatus=1
 # On wayland we cannot restart
 Restart=no
+# Kill any stubborn child processes after this long
+TimeoutStopSec=5
diff --git a/data/gnome-shell-x11.service.in b/data/gnome-shell-x11.service.in
index 2c9fec1b5..a10c33d29 100644
--- a/data/gnome-shell-x11.service.in
+++ b/data/gnome-shell-x11.service.in
@@ -29,3 +29,5 @@ SuccessExitStatus=1
 Restart=always
 # Do not wait before restarting the shell
 RestartSec=0ms
+# Kill any stubborn child processes after this long
+TimeoutStopSec=5