diff --git a/mozilla/extensions/wallet/src/wallet.cpp b/mozilla/extensions/wallet/src/wallet.cpp
index f96c4db6eae..4ae2de8c0f4 100644
--- a/mozilla/extensions/wallet/src/wallet.cpp
+++ b/mozilla/extensions/wallet/src/wallet.cpp
@@ -1478,7 +1478,7 @@ wallet_Initialize() {
     char * message = Wallet_Localize("IncorrectKey_TryAgain?");
     char * failed = Wallet_Localize("KeyFailure");
     while (!Wallet_SetKey(PR_FALSE)) {
-      if (!FE_Confirm(message)) {
+      if (!FE_Confirm(message) || !wallet_GetUsingDialogsPref()) {
         FE_Confirm(failed);
         PR_FREEIF(message);
         PR_FREEIF(failed);