diff --git a/src/component/Canvas/CanvasEditor/components/TextEditorPanel.vue b/src/component/Canvas/CanvasEditor/components/TextEditorPanel.vue
index 33a0c17c..2c01a627 100644
--- a/src/component/Canvas/CanvasEditor/components/TextEditorPanel.vue
+++ b/src/component/Canvas/CanvasEditor/components/TextEditorPanel.vue
@@ -620,12 +620,19 @@ export default {
       // 监听显示文本编辑面板事件
       document.addEventListener("showTextEditor", showEditor);
       document.addEventListener("hideTextEditor", close);
-
+      if(props.canvas) {
+        // props.canvas.on("text:editing:entered", showEditor);
+        props.canvas.on("text:editing:exited", close);
+      }
     });
 
     onUnmounted(() => {
       document.removeEventListener("showTextEditor", showEditor);
       document.removeEventListener("hideTextEditor", close);
+      if(props.canvas) {
+        // props.canvas.off("text:editing:entered", showEditor);
+        props.canvas.off("text:editing:exited", close);
+      }
     });
 
     // 返回所有需要在模板中使用的数据和方法
diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index aebda612..69dcdacd 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -1209,13 +1209,6 @@ defineExpose({
           :activeTool="activeTool"
         />
 
-        <!-- 文本编辑面板 -->
-        <TextEditorPanel
-          v-if="canvasManagerLoaded && !enabledRedGreenMode"
-          :canvas="canvasManager && canvasManager.canvas"
-          :commandManager="commandManager"
-        />
-
         <!-- 液化编辑面板 -->
         <LiquifyPanel
           v-if="canvasManagerLoaded && !enabledRedGreenMode"
@@ -1248,6 +1241,13 @@ defineExpose({
           :activeTool="activeTool"
         />
 
+        <!-- 文本编辑面板 -->
+        <TextEditorPanel
+          v-if="canvasManagerLoaded && !enabledRedGreenMode"
+          :canvas="canvasManager && canvasManager.canvas"
+          :commandManager="commandManager"
+        />
+
         <div class="zoom-info">
           {{ t("Canvas.Scale") }}: {{ currentZoom }}%
           <button class="reset-zoom" @click="resetZoom">