diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index bbc87fa78c..0f1c38bd2c 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -75,7 +75,9 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
             EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
             return;
         }
-        CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
+        if (DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
+            CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
+        }
         CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
         QuickEditorRegion.getInstance().populate(getCurrentEditor());
         JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
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 fd519b0aa0..a148fd3b83 100644
--- a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
+++ b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java
@@ -98,7 +98,7 @@ public abstract class UIListControlPane extends UIControlPane {
                 // richie:避免多次update和populate大大降低效率
                 if (!evt.getValueIsAdjusting()) {
                     // shoc 切换的时候加检验
-                    if (hasInvalid(false) || DesignerContext.getDesignerFrame().getSelectedJTemplate() == null) {
+                    if (hasInvalid(false)) {
                         return;
                     }
                     ((JControlUpdatePane) UIListControlPane.this.controlUpdatePane).update();
diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
index 279873f0b4..1881bd02c0 100644
--- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
@@ -925,7 +925,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         } else {
             this.addAndActivateJTemplate(jt);
         }
-
+        //REPORT-5084：激活后刷新一下右側面板
+        jt.refreshEastPropertiesPane();
     }
 
     /**