diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
index f3fbc8cc85..04dd922430 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
@@ -1190,12 +1190,12 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
 
         getTarget().setTemplateTheme(newTheme, compatible);
 
+        fireTargetModified(shouldCreateUndoState);
         formDesign.refreshRoot();
         FormHierarchyTreePane.getInstance().refreshRoot();
         if (this.index != FORM_TAB) {
             refreshToolArea();
         }
-        fireTargetModified(shouldCreateUndoState);
 
         super.setTemplateTheme(newTheme, compatible);
     }