diff --git a/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolConfigPanel.java b/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolConfigPanel.java
index bed51f9b58a019f82868c58aa7b21a7023bc4def..3976989a720058f3cd1385f0034d94fdbd046770 100644
--- a/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolConfigPanel.java
+++ b/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolConfigPanel.java
@@ -181,7 +181,9 @@ public abstract class NativeToolConfigPanel<OBJECT_TYPE extends DBSObject> imple
 
     @Override
     public void saveSettings() {
-
+        final String selectedHome = homesSelector.getSelectedHome();
+        curDataSource.getConnectionConfiguration().setClientHomeId(selectedHome);
+        curDataSource.persistConfiguration();
     }
 
     @Override
diff --git a/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolWizardDialog.java b/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolWizardDialog.java
index e61101136f980c63dd333aeeb55b009bdbac9524..0373cc805d967d02e601688eccdc555fde756b87 100644
--- a/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolWizardDialog.java
+++ b/plugins/org.jkiss.dbeaver.tasks.native.ui/src/org/jkiss/dbeaver/tasks/ui/nativetool/NativeToolWizardDialog.java
@@ -96,7 +96,6 @@ public class NativeToolWizardDialog extends TaskConfigurationWizardDialog {
     }
 
     private static class NativeClientConfigDialog extends BaseDialog {
-
         private final DBPDataSourceContainer dataSource;
         private ClientHomesSelector homesSelector;
 
@@ -120,10 +119,8 @@ public class NativeToolWizardDialog extends TaskConfigurationWizardDialog {
         protected void okPressed() {
             String selectedHome = homesSelector.getSelectedHome();
             dataSource.getConnectionConfiguration().setClientHomeId(selectedHome);
-            dataSource.getRegistry().flushConfig();
-
+            dataSource.persistConfiguration();
             super.okPressed();
         }
     }
-
 }