diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts
index 9d5dfb8a201..dc2a4918c3b 100644
--- a/apps/browser/src/autofill/services/autofill.service.ts
+++ b/apps/browser/src/autofill/services/autofill.service.ts
@@ -265,9 +265,14 @@ export default class AutofillService implements AutofillServiceInterface {
     }
 
     if (
-      cipher.reprompt !== CipherRepromptType.None &&
+      cipher.reprompt === CipherRepromptType.Password &&
+      // If the master password has is not available, reprompt will error
       (await this.userVerificationService.hasMasterPasswordAndMasterKeyHash())
     ) {
+      if (fromCommand) {
+        this.cipherService.updateLastUsedIndexForUrl(tab.url);
+      }
+
       await BrowserApi.tabSendMessageData(tab, "passwordReprompt", {
         cipherId: cipher.id,
         action: "autofill",