diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -1059,12 +1059,8 @@
         cmdBeforeBrowsing = QString();
 
 #ifdef ENABLE_WALLET
-        WalletModel *wallet_model{nullptr};
-        const int wallet_index = ui->WalletSelector->currentIndex();
-        if (wallet_index > 0) {
-            wallet_model = ui->WalletSelector->itemData(wallet_index)
-                               .value<WalletModel *>();
-        }
+        WalletModel *wallet_model =
+            ui->WalletSelector->currentData().value<WalletModel *>();
 
         if (m_last_wallet_model != wallet_model) {
             if (wallet_model) {