diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ListModelEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ListModelEditor.java
index d8a54f1bc7fc..5d7b811ffa16 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ListModelEditor.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ListModelEditor.java
@@ -64,6 +64,7 @@ public class ListModelEditor extends PropertyEditor<String[]> {
 
   public JComponent getComponent(final RadComponent component, final String[] value, final InplaceContext inplaceContext) {
     myLastComponent = component;
+    myLastValue = value;
     if (inplaceContext != null) {
       if (inplaceContext.isStartedByTyping()) {
         openListEditorDialog(new String[] { Character.toString(inplaceContext.getStartChar()) });
@@ -74,7 +75,6 @@ public class ListModelEditor extends PropertyEditor<String[]> {
       inplaceContext.setModalDialogDisplayed(true);
     }
     else {
-      myLastValue = value;
       myTextField.setText(listValueToString(value));
     }
     return myTextField;