diff --git a/src/main/start-main-application/before-application-is-ready/implementations/setup-shutdown-of-application-when-system-shutdowns.injectable.ts b/src/main/start-main-application/before-application-is-ready/implementations/setup-shutdown-of-application-when-system-shutdowns.injectable.ts
new file mode 100644
index 0000000000..3e917b7313
--- /dev/null
+++ b/src/main/start-main-application/before-application-is-ready/implementations/setup-shutdown-of-application-when-system-shutdowns.injectable.ts
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectable } from "@ogre-tools/injectable";
+import { powerMonitor } from "electron";
+import exitAppInjectable from "../../../app-paths/get-electron-app-path/electron-app/exit-app.injectable";
+import { beforeApplicationIsReadyInjectionToken } from "../before-application-is-ready-injection-token";
+
+const setupShutdownOfApplicationWhenSystemShutdownsInjectable = getInjectable({
+  id: "setup-shutdown-of-application-when-system-shutdowns",
+
+  instantiate: (di) => {
+    const exitApp = di.inject(exitAppInjectable);
+
+    return {
+      run: () => {
+        powerMonitor.on("shutdown", exitApp);
+      },
+    };
+  },
+
+  causesSideEffects: true,
+
+  injectionToken: beforeApplicationIsReadyInjectionToken,
+});
+
+export default setupShutdownOfApplicationWhenSystemShutdownsInjectable;