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 9f8841f02..74c4c4cec 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
@@ -240,6 +240,9 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
         double[] rowSize = new double[]{p, p, p};
         double[] columnSize = {p, p};
 
+        JPanel colorListContainerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        colorListContainerPane.add(colorListPane, BorderLayout.WEST);
+
         JPanel previewLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         previewLabelPane.add(LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Color_Scheme_Preview_Label")), BorderLayout.NORTH);
 
@@ -247,7 +250,7 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
         tipLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));
 
         JPanel content = TableLayoutHelper.createGapTableLayoutPane(new JComponent[][]{
-                        {LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Color_Scheme_Edit_Label")), colorListPane},
+                        {LabelUtils.createLabel(Toolkit.i18nText("Fine-Design_Basic_Template_Theme_Edit_Pane_Color_Scheme_Edit_Label")), colorListContainerPane},
                         {null, tipLabel},
                         {previewLabelPane, extendedContainer},
                 },
diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java
index f9219712c..b1859cd90 100644
--- a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java
+++ b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java
@@ -232,7 +232,14 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
         Dimension size = getSize();
         PaddingMargin margin = toData().getMargin();
 
-        designerEditor.paintEditor(g, size, margin);
+        if (!isEditing) {
+            // CHART-20568 & CHART-20627
+            // EditingMouseListener#startEditing会将图表的ChartComponent放入FormDesigner, 作为编辑中的ChartComponent来显示,
+            // 同时这里又在下层绘制了一遍ChartComponent，导致图表进入编辑状态，会出现两个重叠的ChartComponent。
+            // 考虑到编辑中，FormDesigner中的ChartComponent位于上层，下层的ChartComponent实际上没什么用，所以可以不用绘制
+            // 下层的ChartComponent
+            designerEditor.paintEditor(g, size, margin);
+        }
 
         if (coverPanel != null) {
             int horizonMargin = margin != null ? margin.getLeft() + margin.getRight() : 0;