diff --git a/data/systemd/user/app-override.scope.conf b/data/systemd/user/app-override.scope.conf
new file mode 100644
index 0000000..810bf23
--- /dev/null
+++ b/data/systemd/user/app-override.scope.conf
@@ -0,0 +1,6 @@
+[Unit]
+CollectMode=inactive-or-failed
+PartOf=graphical-session.target
+
+[Scope]
+TimeoutStopSec=5s
diff --git a/data/systemd/user/meson.build b/data/systemd/user/meson.build
index 15834e4..4201de8 100644
--- a/data/systemd/user/meson.build
+++ b/data/systemd/user/meson.build
@@ -5,4 +5,12 @@ install_data(
   ],
   install_dir: systemduserunitdir,
 )
+
+# Applies to the transient scopes cinnamon creates for launched applications
+install_data(
+  [
+    'app-override.scope.conf',
+  ],
+  install_dir: systemduserunitdir / 'app-cinnamon-.scope.d',
+)
 endif
diff --git a/debian/cinnamon-session.install b/debian/cinnamon-session.install
index fdaef25..8d75028 100644
--- a/debian/cinnamon-session.install
+++ b/debian/cinnamon-session.install
@@ -1,5 +1,6 @@
 usr/bin/cinnamon-session*
 usr/lib/*/cinnamon-session*
+usr/lib/systemd/user/app-cinnamon-.scope.d/app-override.scope.conf
 usr/lib/systemd/user/cinnamon-session.target
 usr/share/cinnamon-session
 usr/share/glib-2.0/schemas/org.cinnamon.SessionManager.gschema.xml