diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java
index 8551f735b9..98a951a6a8 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/VcsConfigManager.java
@@ -81,7 +81,7 @@ public class VcsConfigManager implements XMLReadable, XMLWriter {
             this.setUseInterval(reader.getAttrAsBoolean("useInterval", true));
             this.setVcsEnable(reader.getAttrAsBoolean("vcsEnable", true));
             this.setAutoSaveInterval(reader.getAttrAsInt("autoSaveInterval", 15));
-            this.setUseAutoSave(reader.getAttrAsBoolean("useAutoSave", false));
+            this.setUseAutoSave(reader.getAttrAsBoolean("useAutoSave", true));
         }
     }
 
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java
index cd3e6f09a6..0479ee68e7 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsMovePanel.java
@@ -307,7 +307,7 @@ public class VcsMovePanel extends BasicPane {
         panel.add(titleLabel);
         panel.add(firstLabel);
         panel.add(secondLabel);
-        int value = FineJOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), panel, Toolkit.i18nText("Fine-Design_Vcs_Move_Title"), JOptionPane.YES_NO_OPTION);
+        int value = FineJOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DesignerContext.getDesignerFrame()), panel, Toolkit.i18nText("Fine-Design_Vcs_Move_Title"), JOptionPane.YES_NO_OPTION);
         processMove(value);
     }