diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
index 67fa2b324..6cc45922e 100644
--- a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
+++ b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
@@ -132,6 +132,10 @@ public abstract class UIListControlPane extends UIControlPane {
             protected void doAfterLostFocus() {
                 UIListControlPane.this.updateControlUpdatePane();
             }
+            @Override
+            protected void doAfterStopEditing() {
+                saveSettings();
+            }
         };
         nameEdList.setCellRenderer(new UINameableListCellRenderer(this));
         return nameEdList;
diff --git a/designer_base/src/com/fr/design/gui/ilist/UINameEdList.java b/designer_base/src/com/fr/design/gui/ilist/UINameEdList.java
index 823c95d6e..3ab1a58c6 100644
--- a/designer_base/src/com/fr/design/gui/ilist/UINameEdList.java
+++ b/designer_base/src/com/fr/design/gui/ilist/UINameEdList.java
@@ -312,9 +312,14 @@ public class UINameEdList extends UIList implements CellEditorListener {
             String name = StringUtils.isBlank(value.toString()) ? oldName : value.toString();
             setNameAt(name, editingIndex);
             removeComp();
+            doAfterStopEditing();
         }
     }
 
+    protected void doAfterStopEditing() {
+        // default: do nothing
+    }
+
     public String[] getAllNames() {
         int length = this.getModel().getSize();
         String[] names = new String[length];