diff --git a/lib/reactions/on_current_node_change.dart b/lib/reactions/on_current_node_change.dart
index 4b49d05ad..8b67674a6 100644
--- a/lib/reactions/on_current_node_change.dart
+++ b/lib/reactions/on_current_node_change.dart
@@ -8,14 +8,18 @@ void startOnCurrentNodeChangeReaction(AppStore appStore) {
   _onCurrentNodeChangeReaction?.reaction.dispose();
   appStore.settingsStore.nodes.observe((change) async {
     try {
-      await appStore.wallet!.connectToNode(node: change.newValue!);
+      if(change.newValue?.type == appStore.wallet!.type) {
+        await appStore.wallet!.connectToNode(node: change.newValue!);
+      }
     } catch (e) {
       printV(e.toString());
     }
   });
   appStore.settingsStore.powNodes.observe((change) async {
     try {
-      await appStore.wallet!.connectToPowNode(node: change.newValue!);
+      if(change.newValue?.type == appStore.wallet!.type) {
+        await appStore.wallet!.connectToPowNode(node: change.newValue!);
+      }
     } catch (e) {
       printV(e.toString());
     }
diff --git a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
index 2f190c857..a39235b89 100644
--- a/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+++ b/lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
@@ -343,13 +343,14 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
             ),
             const SizedBox(height: 24),
             LoadingPrimaryButton(
-              onPressed: () {
+              onPressed: () async {
                 if (widget.privacySettingsViewModel.addCustomNode) {
                   if (_formKey.currentState != null && !_formKey.currentState!.validate()) {
                     return;
                   }
 
-                  widget.nodeViewModel.save();
+                  await widget.nodeViewModel.save();
+                  widget.nodeViewModel.setAsCurrent(widget.nodeViewModel.editingNode!);
                 }
                 if (testnetValue == true &&
                     widget.privacySettingsViewModel.type == WalletType.bitcoin) {
@@ -358,7 +359,7 @@ class _AdvancedPrivacySettingsBodyState extends State<_AdvancedPrivacySettingsBo
                   widget.nodeViewModel.address = publicBitcoinTestnetElectrumAddress;
                   widget.nodeViewModel.port = publicBitcoinTestnetElectrumPort;
 
-                  widget.nodeViewModel.save();
+                  await widget.nodeViewModel.save();
                 }
                 if (_passphraseFormKey.currentState != null &&
                     !_passphraseFormKey.currentState!.validate()) {