diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index d742e2ebe6b..c9831aa762f 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -335,8 +335,8 @@ export default class MainBackground {
       ? new BrowserMessagingPrivateModeBackgroundService()
       : new BrowserMessagingService();
     this.logService = new ConsoleLogService(false);
-    this.keyGenerationService = new KeyGenerationService(this.cryptoFunctionService);
     this.cryptoFunctionService = new WebCryptoFunctionService(self);
+    this.keyGenerationService = new KeyGenerationService(this.cryptoFunctionService);
     this.storageService = new BrowserLocalStorageService();
     this.secureStorageService = new BrowserLocalStorageService();
     this.memoryStorageService =
diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
index 92d9167df4a..64da1579c8b 100644
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -285,6 +285,7 @@ function getBgService<T>(service: keyof MainBackground) {
         return cryptoService;
       },
       deps: [
+        KeyGenerationService,
         CryptoFunctionService,
         EncryptService,
         PlatformUtilsService,