diff --git a/src/services/autofillService.js b/src/services/autofillService.js
index 1008421a701..624c7f897c6 100644
--- a/src/services/autofillService.js
+++ b/src/services/autofillService.js
@@ -303,7 +303,7 @@ function initAutofill() {
                     login: login,
                     pageDetails: pageDetails,
                     fromBackground: true,
-                    skipTotp: true,
+                    skipTotp: !fromCommand,
                     skipLastUsed: true,
                     skipUsernameOnlyFill: !fromCommand
                 });