diff --git a/libs/components/board-shapes/src/editor-util/EditorUtil.tsx b/libs/components/board-shapes/src/editor-util/EditorUtil.tsx
index cb6e56275a..805ada0623 100644
--- a/libs/components/board-shapes/src/editor-util/EditorUtil.tsx
+++ b/libs/components/board-shapes/src/editor-util/EditorUtil.tsx
@@ -8,6 +8,7 @@ import {
     TDShapeType,
     TransformInfo,
 } from '@toeverything/components/board-types';
+import type { BlockEditor } from '@toeverything/components/editor-core';
 import { MIN_PAGE_WIDTH } from '@toeverything/components/editor-core';
 import { styled } from '@toeverything/components/ui';
 import type { MouseEvent, SyntheticEvent } from 'react';
@@ -66,6 +67,7 @@ export class EditorUtil extends TDShapeUtil<T, E> {
     Component = TDShapeUtil.Component<T, E, TDMeta>(
         ({ shape, meta: { app }, events, isEditing, onShapeChange }, ref) => {
             const containerRef = useRef<HTMLDivElement>();
+            const editorRef = useRef<BlockEditor>();
             const {
                 workspace,
                 rootBlockId,
@@ -135,6 +137,18 @@ export class EditorUtil extends TDShapeUtil<T, E> {
                 }
             }, [app, state, shape.id, editingText, editingId]);
 
+            useEffect(() => {
+                (async () => {
+                    if (isEditing) {
+                        const lastBlock =
+                            await editorRef.current.getLastBlock();
+                        editorRef.current.selectionManager.activeNodeByNodeId(
+                            lastBlock.id
+                        );
+                    }
+                })();
+            }, [isEditing]);
+
             const onMouseDown = useCallback(
                 (e: MouseEvent) => {
                     if (e.detail === 2) {
@@ -159,6 +173,7 @@ export class EditorUtil extends TDShapeUtil<T, E> {
                             rootBlockId={rootBlockId}
                             scrollBlank={false}
                             isEdgeless
+                            ref={editorRef}
                         />
                         {editingText ? null : <Mask />}
                     </Container>