diff --git a/drongo b/drongo
index 1a20e038..d05ec39d 160000
--- a/drongo
+++ b/drongo
@@ -1 +1 @@
-Subproject commit 1a20e0381c8961d51e5ccef04e3d47d41cec9388
+Subproject commit d05ec39df7d7c8d23f61f39338c467b9507f0aaa
diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java
index 2b825f43..d4f9ca47 100644
--- a/src/main/java/com/sparrowwallet/sparrow/AppController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java
@@ -1014,7 +1014,9 @@ public class AppController implements Initializable {
             for(Map.Entry<WalletAndKey, Storage> entry : walletAndKey.getChildWallets().entrySet()) {
                 openWallet(entry.getValue(), entry.getKey(), walletAppController, true);
             }
-            Platform.runLater(() -> selectTab(walletAndKey.getWallet()));
+            if(walletAndKey.getWallet().isMasterWallet()) {
+                Platform.runLater(() -> selectTab(walletAndKey.getWallet()));
+            }
         } catch(Exception e) {
             log.error("Error opening wallet", e);
             showErrorDialog("Error Opening Wallet", e.getMessage());
diff --git a/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java b/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
index 5181a5e4..8cc4f1d2 100644
--- a/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
+++ b/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
@@ -1587,17 +1587,26 @@ public class ElectrumServer {
                         if(nodeTransactionMap.values().stream().anyMatch(blockTransactionHashes -> !blockTransactionHashes.isEmpty())) {
                             Wallet masterWalletCopy = wallet.copy();
                             List<StandardAccount> searchAccounts = getStandardAccounts(wallet);
+                            Set<StandardAccount> foundAccounts = new LinkedHashSet<>();
                             for(int j = 0; j < searchAccounts.size(); j++) {
                                 StandardAccount standardAccount = searchAccounts.get(j);
                                 Wallet childWallet = masterWalletCopy.addChildWallet(standardAccount);
                                 Map<WalletNode, Set<BlockTransactionHash>> childTransactionMap = new TreeMap<>();
                                 electrumServer.getReferences(childWallet, childWallet.getNode(KeyPurpose.RECEIVE).getChildren(), childTransactionMap, 0);
                                 if(childTransactionMap.values().stream().anyMatch(blockTransactionHashes -> !blockTransactionHashes.isEmpty())) {
-                                    wallet.addChildWallet(standardAccount);
+                                    if(StandardAccount.WHIRLPOOL_ACCOUNTS.contains(standardAccount)) {
+                                        foundAccounts.addAll(StandardAccount.WHIRLPOOL_ACCOUNTS);
+                                    } else {
+                                        foundAccounts.add(standardAccount);
+                                    }
                                 }
                                 updateProgress(i + j, wallets.size() + StandardAccount.values().length);
                             }
 
+                            for(StandardAccount standardAccount : foundAccounts) {
+                                wallet.addChildWallet(standardAccount);
+                            }
+
                             return Optional.of(wallet);
                         }
                     }