diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 6bb1c0314d5a..59b89b56e951 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -622,6 +622,7 @@ void BitcoinGUI::createActions()
         connect(m_migrate_wallet_action, &QAction::triggered, [this] {
             auto activity = new MigrateWalletActivity(m_wallet_controller, this);
             connect(activity, &MigrateWalletActivity::migrated, this, &BitcoinGUI::setCurrentWallet);
+            connect(activity, &MigrateWalletActivity::migrated, rpcConsole, &RPCConsole::setCurrentWallet);
             activity->migrate(walletFrame->currentWalletModel());
         });
         connect(m_mask_values_action, &QAction::toggled, this, &BitcoinGUI::setPrivacy);
diff --git a/src/qt/walletcontroller.cpp b/src/qt/walletcontroller.cpp
index 88394f3dc776..b50272c72493 100644
--- a/src/qt/walletcontroller.cpp
+++ b/src/qt/walletcontroller.cpp
@@ -26,6 +26,7 @@
 #include <chrono>
 
 #include <QApplication>
+#include <QDialog>
 #include <QMessageBox>
 #include <QMetaObject>
 #include <QMutexLocker>
@@ -581,7 +582,7 @@ void MigrateWalletActivity::migrate(WalletModel* wallet_model)
     if (enc_status == WalletModel::EncryptionStatus::Locked || enc_status == WalletModel::EncryptionStatus::Unlocked) {
         AskPassphraseDialog dlg(AskPassphraseDialog::Unlock, m_parent_widget, &passphrase);
         dlg.setModel(wallet_model);
-        dlg.exec();
+        if (dlg.exec() != QDialog::Accepted) return;
     }
 
     // GUI needs to remove the wallet so that it can actually be unloaded by migration