diff --git a/common.nix b/common.nix
index 96e8f85..b15c8c8 100644
--- a/common.nix
+++ b/common.nix
@@ -57,6 +57,9 @@
   # in broken states across sessions (e.g. waybar failing to start on re-login).
   services.logind.settings.Login.KillUserProcesses = true;
 
+  # Shorten shutdown stop timeout to avoid long "stop job" waits
+  systemd.settings.Manager.DefaultTimeoutStopSec = "10s";
+
   # Make boot time quicker
   boot.loader.timeout = lib.mkDefault 5;
   systemd.services.NetworkManager-wait-online.enable = false;