diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
index afd65f3e5..d441984c2 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
@@ -144,8 +144,6 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
                     connectionListDialog.setDoOKSucceed(false);
                     return;
                 }
-                // 关闭定义数据连接页面，为其解锁
-                EditLockUtils.unlock(LockItem.CONNECTION);
                 Configurations.modify(new WorkerFacade(ConnectionConfig.class) {
                     @Override
                     public void run() {
@@ -161,6 +159,8 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
                     @Override
                     public void afterCommit() {
                         DesignerContext.getDesignerBean("databasename").refreshBeanElement();
+                        // 关闭定义数据连接页面，为其解锁
+                        EditLockUtils.unlock(LockItem.CONNECTION);
                     }
                 }));