diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index 3fc90fabb..6a20f831c 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -1,4 +1,6 @@
 {
+  "floatWindow Mode": "Hover to display a floating window",
+  "floatWindow Mode Tip": "After closing, you need to hold down the <code class='fn__code'>${hotkey}</code> key to display the floating window",
   "codeSnippet": "Code Snippet",
   "useFixedPort": "Use Fixed Port",
   "useFixedPortTip": "After enabling, only the port <code class='fn__code'>6806</code> will be used. When disabled, both random ports and <code class='fn__code'>6806</code> will be used. The application will be closed automatically after modification, please restart manually",
diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
index 24d0c4cfe..6ffebf622 100644
--- a/app/appearance/langs/es_ES.json
+++ b/app/appearance/langs/es_ES.json
@@ -1,4 +1,6 @@
 {
+  "floatWindow Mode": "Pase el cursor para mostrar una ventana flotante",
+  "Sugerencia para el modo FloatWindow": "Después de cerrar, debe mantener presionada la tecla <code class='fn__code'>${hotkey}</code> para mostrar la ventana flotante",
   "codeSnippet": "Fragmento de código",
   "useFixedPort": "Usar puerto fijo",
   "useFixedPortTip": "Después de habilitarlo, solo se usará el puerto <code class='fn__code'>6806</code>. Cuando está deshabilitado, se utilizarán tanto los puertos aleatorios como <code class='fn__code'>6806</code>. La aplicación se cerrará automáticamente después de la modificación, por favor reinicie manualmente",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index 7067a54fe..8481bbca3 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,6 @@
 {
+  "floatWindow Mode": "Survolez pour afficher une fenêtre flottante",
+  "floatWindow Mode Tip": "Après la fermeture, vous devez maintenir la touche <code class='fn__code'>${hotkey}</code> enfoncée pour afficher la fenêtre flottante",
   "codeSnippet": "Extrait de code",
   "useFixedPort": "Utiliser un port fixe",
   "useFixedPortTip": "Après activation, seul le port <code class='fn__code'>6806</code> sera utilisé. Lorsqu'il est désactivé, les ports aléatoires et <code class='fn__code'>6806</code> seront utilisés. L'application sera fermée automatiquement après modification, veuillez la redémarrer manuellement.",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 4fcfb3e37..ac4d7636d 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,6 @@
 {
+  "floatWindow Mode": "懸停出現浮窗",
+  "floatWindow Mode Tip": "關閉後需按住 <code class='fn__code'>${hotkey}</code> 鍵才能出現浮窗",
   "codeSnippet": "代碼片段",
   "useFixedPort": "使用固定端口",
   "useFixedPortTip": "开启后将仅使用固定端口 <code class='fn__code'>6806</code>，关闭时同时使用随机端口和 <code class='fn__code'>6806</code>。修改後會自動關閉應用，請手動重啟",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index 85da7395b..eb46b6cc8 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,6 @@
 {
+  "floatWindowMode": "悬停出现浮窗",
+  "floatWindowModeTip": "关闭后需按住 <code class='fn__code'>${hotkey}</code> 键才能出现浮窗",
   "codeSnippet": "代码片段",
   "useFixedPort": "使用固定端口",
   "useFixedPortTip": "开启后将仅使用固定端口 <code class='fn__code'>6806</code>，关闭时同时使用随机端口和 <code class='fn__code'>6806</code>。修改后会自动关闭应用，请手动重启",
diff --git a/app/src/config/editor.ts b/app/src/config/editor.ts
index 761d3a5e6..0b713b6c4 100644
--- a/app/src/config/editor.ts
+++ b/app/src/config/editor.ts
@@ -5,6 +5,7 @@ import {confirmDialog} from "../dialog/confirmDialog";
 import {setPadding} from "../protyle/ui/initUI";
 import {reloadProtyle} from "../protyle/util/reload";
 import {disabledProtyle, enableProtyle} from "../protyle/util/onGet";
+import {updateHotkeyTip} from "../protyle/util/compatibility";
 
 export const editor = {
     element: undefined as Element,
@@ -100,6 +101,14 @@ export const editor = {
     <span class="fn__space"></span>
     <input class="b3-switch fn__flex-center" id="embedBlockBreadcrumb" type="checkbox"${window.siyuan.config.editor.embedBlockBreadcrumb ? " checked" : ""}/>
 </label>
+<label class="fn__flex b3-label">
+    <div class="fn__flex-1">
+        ${window.siyuan.languages.floatWindowMode}
+        <div class="b3-label__text">${window.siyuan.languages.floatWindowModeTip.replace("${hotkey}", updateHotkeyTip("⌘"))}</div>
+    </div>
+    <span class="fn__space"></span>
+    <input class="b3-switch fn__flex-center" id="floatWindowMode" type="checkbox"${window.siyuan.config.editor.floatWindowMode === 0 ? " checked" : ""}/>
+</label>
 <label class="fn__flex b3-label">
     <div class="fn__flex-1">
         ${window.siyuan.languages.outlineOutdent}
@@ -252,6 +261,7 @@ export const editor = {
                 codeSyntaxHighlightLineNum: (editor.element.querySelector("#codeSyntaxHighlightLineNum") as HTMLInputElement).checked,
                 embedBlockBreadcrumb: (editor.element.querySelector("#embedBlockBreadcrumb") as HTMLInputElement).checked,
                 listLogicalOutdent: (editor.element.querySelector("#listLogicalOutdent") as HTMLInputElement).checked,
+                floatWindowMode: (editor.element.querySelector("#floatWindowMode") as HTMLInputElement).checked ? 0 : 1,
                 plantUMLServePath: (editor.element.querySelector("#plantUMLServePath") as HTMLInputElement).value,
                 katexMacros: (editor.element.querySelector("#katexMacros") as HTMLTextAreaElement).value,
                 codeLineWrap: (editor.element.querySelector("#codeLineWrap") as HTMLInputElement).checked,
diff --git a/app/src/config/search.ts b/app/src/config/search.ts
index b312d3106..757411fcb 100644
--- a/app/src/config/search.ts
+++ b/app/src/config/search.ts
@@ -15,7 +15,8 @@ export const initConfigSearch = (element: HTMLElement) => {
             "editor", "md2", "md3", "md12", "md16", "md27", "md28", "md29", "md30", "md31", "md32", "md33", "md34",
             "md39", "md40", "fontSizeTip", "fontSize", "font", "font1", "generateHistory", "generateHistoryInterval",
             "historyRetentionDays", "historyRetentionDaysTip", "clearHistory", "katexMacros", "katexMacrosTip",
-            "editReadonly", "editReadonlyTip", "embedBlockBreadcrumb", "embedBlockBreadcrumbTip", "outdentTip", "outdent"
+            "editReadonly", "editReadonlyTip", "embedBlockBreadcrumb", "embedBlockBreadcrumbTip", "outdentTip",
+            "outdent", "floatWindowMode", "floatWindowModeTip"
         ]),
 
         // 文档树
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index 8c365c28f..509b08895 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -246,6 +246,7 @@ declare interface IEditor {
     listLogicalOutdent: boolean;
     katexMacros: string;
     fullWidth: boolean;
+    floatWindowMode: number;
     fontSize: number;
     generateHistoryInterval: number;
     historyRetentionDays: number;