diff --git a/apps/ai-game-creator-shell/src/features/ui-editor/useUiEditorState.ts b/apps/ai-game-creator-shell/src/features/ui-editor/useUiEditorState.ts
index 7d3966fd1..13ffa45e8 100644
--- a/apps/ai-game-creator-shell/src/features/ui-editor/useUiEditorState.ts
+++ b/apps/ai-game-creator-shell/src/features/ui-editor/useUiEditorState.ts
@@ -1520,9 +1520,10 @@ export function useUiEditorState(initialState: State = EMPTY_UI_EDITOR_STATE) {
   const clearState = useCallback((): UiEditorOperationResult => {
     const blocked = guard();
     if (blocked) return blocked;
-    commit(cloneState(EMPTY_UI_EDITOR_STATE));
+    resetHistory();
+    applyState(cloneState(EMPTY_UI_EDITOR_STATE));
     return { ok: true, value: undefined };
-  }, [commit, guard]);
+  }, [applyState, guard, resetHistory]);
 
   const replaceState = useCallback(
     (nextState: State, options: UiEditorReplaceStateOptions = {}) => {
diff --git a/apps/ai-game-creator-shell/tests/uiEditorState.test.ts b/apps/ai-game-creator-shell/tests/uiEditorState.test.ts
index fed357201..8962e441a 100644
--- a/apps/ai-game-creator-shell/tests/uiEditorState.test.ts
+++ b/apps/ai-game-creator-shell/tests/uiEditorState.test.ts
@@ -666,6 +666,16 @@ describe('useUiEditorState', () => {
       canUndo: false,
       canRedo: false,
     });
+
+    act(() => {
+      result.current.setImageName('page', '清空前');
+      result.current.clearState();
+    });
+    expect(result.current.state).toEqual(EMPTY_UI_EDITOR_STATE);
+    expect(result.current.historyState).toEqual({
+      canUndo: false,
+      canRedo: false,
+    });
   });
 
   it('groups multiple replacements into one history transaction and rolls back failures', async () => {