diff --git a/drongo b/drongo
index d24243ce..8e50815a 160000
--- a/drongo
+++ b/drongo
@@ -1 +1 @@
-Subproject commit d24243ce20a9d10f77cfe95f172940743a94a8a7
+Subproject commit 8e50815a3faca8ddc03bf20935ee9ee13b897066
diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedController.java
index e2150500..5cc2aaa2 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedController.java
@@ -83,6 +83,10 @@ public class AdvancedController implements Initializable {
         });
     }
 
+    public void close() {
+        gapLimit.commitValue();
+    }
+
     private ObservableList<Integer> getWatchListItems(Wallet wallet) {
         return FXCollections.observableList(DEFAULT_WATCH_LIST_ITEMS.stream().filter(val -> val < 0 || val > wallet.getGapLimit()).collect(Collectors.toList()));
     }
diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedDialog.java b/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedDialog.java
index c2cc1a44..40533171 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedDialog.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedDialog.java
@@ -36,6 +36,10 @@ public class AdvancedDialog extends Dialog<Boolean> {
             dialogPane.setPrefHeight(300);
             AppServices.moveToActiveWindowScreen(this);
 
+            setOnCloseRequest(event -> {
+                settingsAdvancedController.close();
+            });
+
             setResultConverter(dialogButton -> dialogButton == passwordButtonType);
         }
         catch(IOException e) {
diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java
index ae1b1564..fc92365f 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java
@@ -135,6 +135,10 @@ public class MixToController implements Initializable {
         });
     }
 
+    public void close() {
+        minMixes.commitValue();
+    }
+
     public MixConfig getMixConfig() {
         return mixConfig;
     }
diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/MixToDialog.java b/src/main/java/com/sparrowwallet/sparrow/wallet/MixToDialog.java
index 8a844e6c..8f32ce69 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/MixToDialog.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/MixToDialog.java
@@ -51,6 +51,7 @@ public class MixToDialog extends Dialog<MixConfig> {
             setResultConverter(dialogButton -> dialogButton == applyButtonType ? mixToController.getMixConfig() : null);
 
             setOnCloseRequest(event -> {
+                mixToController.close();
                 EventManager.get().unregister(this);
             });
             EventManager.get().register(this);