diff --git a/beacon_chain/keystore_management.nim b/beacon_chain/keystore_management.nim
index 804f6318b..a7afa1d46 100644
--- a/beacon_chain/keystore_management.nim
+++ b/beacon_chain/keystore_management.nim
@@ -377,7 +377,8 @@ proc pickPasswordAndSaveWallet(rng: var BrHmacDrbgContext,
                      continue
           break
 
-      let nextAccount = if config.walletsCmd == WalletsCmd.restore:
+      let nextAccount = if config.cmd == wallets and
+                           config.walletsCmd == WalletsCmd.restore:
         config.restoredDepositsCount
       else:
         none Natural