diff --git a/simple-mind-map/src/core/render/TextEdit.js b/simple-mind-map/src/core/render/TextEdit.js
index d828724b..cc0d7009 100644
--- a/simple-mind-map/src/core/render/TextEdit.js
+++ b/simple-mind-map/src/core/render/TextEdit.js
@@ -113,6 +113,16 @@ export default class TextEdit {
           )
         }
       }
+      if (
+        opt.enableAutoEnterTextEditWhenKeydown !==
+        lastOpt.enableAutoEnterTextEditWhenKeydown
+      ) {
+        window[
+          opt.enableAutoEnterTextEditWhenKeydown
+            ? 'addEventListener'
+            : 'removeEventListener'
+        ]('keydown', this.onKeydown)
+      }
     })
   }
 
diff --git a/web/src/lang/en_us.js b/web/src/lang/en_us.js
index cbb50039..54ae0d32 100644
--- a/web/src/lang/en_us.js
+++ b/web/src/lang/en_us.js
@@ -76,7 +76,8 @@ export default {
     tagPosition: 'Node tag position',
     tagPositionRight: 'Text right',
     tagPositionBottom: 'Text bottom',
-    alwaysShowExpandBtn: 'Always show expand btn'
+    alwaysShowExpandBtn: 'Always show expand btn',
+    enableAutoEnterTextEditWhenKeydown: 'Auto enter text edit when keydown'
   },
   color: {
     moreColor: 'More color'
diff --git a/web/src/lang/zh_cn.js b/web/src/lang/zh_cn.js
index 393b1af9..e8353e17 100644
--- a/web/src/lang/zh_cn.js
+++ b/web/src/lang/zh_cn.js
@@ -74,7 +74,8 @@ export default {
     tagPosition: '节点标签显示的位置',
     tagPositionRight: '文本右侧',
     tagPositionBottom: '文本下面',
-    alwaysShowExpandBtn: '是否一直显示展开收起按钮'
+    alwaysShowExpandBtn: '是否一直显示展开收起按钮',
+    enableAutoEnterTextEditWhenKeydown: '键盘输入时自动进入文本编辑'
   },
   color: {
     moreColor: '更多颜色'
diff --git a/web/src/lang/zh_tw.js b/web/src/lang/zh_tw.js
index 94267286..1075efb6 100644
--- a/web/src/lang/zh_tw.js
+++ b/web/src/lang/zh_tw.js
@@ -44,7 +44,8 @@ export default {
     tagPosition: '節點標簽顯示的位置',
     tagPositionRight: '文本右側',
     tagPositionBottom: '文本下面',
-    alwaysShowExpandBtn: '是否壹直顯示展開收起按鈕'
+    alwaysShowExpandBtn: '是否壹直顯示展開收起按鈕',
+    enableAutoEnterTextEditWhenKeydown: '鍵盤輸入時自動進入文本編輯'
   },
   setting: {
     title: '設置',
diff --git a/web/src/pages/Edit/components/Edit.vue b/web/src/pages/Edit/components/Edit.vue
index 2f8d8c35..8d468436 100644
--- a/web/src/pages/Edit/components/Edit.vue
+++ b/web/src/pages/Edit/components/Edit.vue
@@ -368,11 +368,11 @@ export default {
           }
         },
         openRealtimeRenderOnNodeTextEdit: true,
+        enableAutoEnterTextEditWhenKeydown: true,
         ...(config || {}),
         iconList: [...icon],
         useLeftKeySelectionRightKeyDrag: this.useLeftKeySelectionRightKeyDrag,
         customInnerElsAppendTo: null,
-        enableAutoEnterTextEditWhenKeydown: true,
         customHandleClipboardText: handleClipboardText,
         defaultNodeImage: require('../../../assets/img/图片加载失败.svg'),
         initRootNodePosition: ['center', 'center'],
diff --git a/web/src/pages/Edit/components/Setting.vue b/web/src/pages/Edit/components/Setting.vue
index 0e6fee1d..d7378528 100644
--- a/web/src/pages/Edit/components/Setting.vue
+++ b/web/src/pages/Edit/components/Setting.vue
@@ -209,6 +209,16 @@
           >
         </div>
       </div>
+      <!-- 是否在键盘输入时自动进入节点文本编辑模式 -->
+      <div class="row">
+        <div class="rowItem">
+          <el-checkbox
+            v-model="config.enableAutoEnterTextEditWhenKeydown"
+            @change="updateOtherConfig('enableAutoEnterTextEditWhenKeydown', $event)"
+            >{{ $t('setting.enableAutoEnterTextEditWhenKeydown') }}</el-checkbox
+          >
+        </div>
+      </div>
       <!-- 是否开启手绘风格 -->
       <div class="row" v-if="supportHandDrawnLikeStyle">
         <div class="rowItem">
@@ -360,7 +370,8 @@ export default {
         createNewNodeBehavior: 'default',
         tagPosition: 'right',
         openRealtimeRenderOnNodeTextEdit: true,
-        alwaysShowExpandBtn: false
+        alwaysShowExpandBtn: false,
+        enableAutoEnterTextEditWhenKeydown: true
       },
       watermarkConfig: {
         show: false,