diff --git a/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts b/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
index 17c83b7e976..f19ec12f8a2 100644
--- a/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
+++ b/apps/desktop/src/autofill/main/main-desktop-autotype.service.ts
@@ -66,7 +66,7 @@ export class MainDesktopAutotypeService {
   }
 
   // Deregister the keyboard shortcut if registered.
-  private disableAutotype() {
+  disableAutotype() {
     const formattedKeyboardShortcut = this.autotypeKeyboardShortcut.getElectronFormat();
 
     if (globalShortcut.isRegistered(formattedKeyboardShortcut)) {
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index 2a4c672d7b8..378441e4b32 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -310,6 +310,10 @@ export class Main {
       this.logService,
       this.windowMain,
     );
+
+    app.on("will-quit", () => {
+      this.mainDesktopAutotypeService.disableAutotype();
+    });
   }
 
   bootstrap() {