diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index aace7feb9e0..a1317b2ad96 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -1484,6 +1484,7 @@ jobs:
         env:
           APP_STORE_CONNECT_TEAM_ISSUER: ${{ secrets.APP_STORE_CONNECT_TEAM_ISSUER }}
           APP_STORE_CONNECT_AUTH_KEY_PATH: ~/private_keys/AuthKey_6TV9MKN3GP.p8
+          APP_STORE_CONNECT_AUTH_KEY: 6TV9MKN3GP
           CSC_FOR_PULL_REQUEST: true
         run: npm run pack:mac:masdev:with-extension
 
diff --git a/apps/desktop/scripts/after-sign.js b/apps/desktop/scripts/after-sign.js
index 20c24c8a76b..9bb3d4b8bf4 100644
--- a/apps/desktop/scripts/after-sign.js
+++ b/apps/desktop/scripts/after-sign.js
@@ -74,7 +74,7 @@ async function run(context) {
     }
   }
 
-  if (macBuild) {
+  if (macBuild  || copyAutofillExtension) {
     console.log("### Notarizing " + appPath);
     if (process.env.APP_STORE_CONNECT_TEAM_ISSUER) {
       const appleApiIssuer = process.env.APP_STORE_CONNECT_TEAM_ISSUER;