diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java
index 9544b2563..caa495aac 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java
@@ -107,7 +107,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
         addAttributeChangeListener(new AttributeChangeListener() {
             @Override
             public void attributeChange() {
-                if (!isPopulating) {
+                if (!isPopulating && !refreshingThemedColor) {
                     valueChangeAction();
                 }
             }
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java
index adeca3d7a..5c282033f 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/edit/ui/ColorListPane.java
@@ -40,6 +40,8 @@ public class ColorListPane extends JPanel implements UIObserver {
     private final EventListenerList colorChangeListenerList = new EventListenerList();
     private UIObserverListener uiObserverListener;
 
+    private boolean isPopulating = false;
+
     public ColorListPane() {
         this(DEFAULT_COLOR_COUNT, DEFAULT_COLOR_SIZE, DEFAULT_COLOR_GAP);
     }
@@ -61,6 +63,9 @@ public class ColorListPane extends JPanel implements UIObserver {
             colorButton.addChangeListener(new ChangeListener() {
                 @Override
                 public void stateChanged(ChangeEvent e) {
+                    if (isPopulating) {
+                        return;
+                    }
                     colorList.set(index, colorButton.getSelectObject());
                     fireColorStateChanged();
                 }
@@ -88,6 +93,7 @@ public class ColorListPane extends JPanel implements UIObserver {
     }
 
     public void populate(List<Color> colors) {
+        isPopulating = true;
         colorList.clear();
         for (int i = 0; i < colors.size(); i++) {
             Color color = colors.get(i);
@@ -96,6 +102,7 @@ public class ColorListPane extends JPanel implements UIObserver {
                 colorButtons.get(i).setSelectObject(color);
             }
         }
+        isPopulating = false;
     }
 
     public List<Color> update() {