diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
index d5dcb87eb..064335101 100644
--- a/app/appearance/langs/en_US.json
+++ b/app/appearance/langs/en_US.json
@@ -249,7 +249,8 @@
   "copyProtocol": "Copy block hyperlink",
   "uploadAssets2CDN": "Upload asset files to cloud",
   "notSupport1": "Does not support drag and drop across notebooks",
-  "keymapTip": "After the shortcut keys are modified, they need to be restarted to take effect",
+  "keymapTip": "After some shortcut keys are modified, you need to click the refresh button to take effect",
+  "keymapTip2": "Use default shortcut keys",
   "searchLimit": "The number of search results displayed",
   "searchLimit1": "If the amount of data is large, do not configure the value too large, the default is <code>64</code>",
   "searchCaseSensitive": "Case Sensitive",
diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
index ed363fc97..f56b6a406 100644
--- a/app/appearance/langs/fr_FR.json
+++ b/app/appearance/langs/fr_FR.json
@@ -249,7 +249,8 @@
   "copyProtocol": "Copier bloc d'hyperliens",
   "uploadAssets2CDN": "Transférer les fichiers asset vers le Cloud",
   "notSupport1": "Le glisser-déposer entre carnets n'est pas pris en charge",
-  "keymapTip": "Après avoir modifié les touches de raccourci, il faut les relancer pour qu'elles prennent effet",
+  "keymapTip": "Après la modification de certaines touches de raccourci, vous devez cliquer sur le bouton d'actualisation pour prendre effet",
+  "keymapTip2": "Utiliser les touches de raccourci par défaut",
   "searchLimit": "Le nombre de résultats de recherche affichés",
   "searchLimit1": "Si la quantité de données est importante, ne configurez pas la valeur trop grande, la valeur par défaut est <code>64</code>",
   "searchCaseSensitive": "Sensible à la casse",
diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
index 68f4b2075..6b2a1f33d 100644
--- a/app/appearance/langs/zh_CHT.json
+++ b/app/appearance/langs/zh_CHT.json
@@ -249,7 +249,8 @@
   "copyProtocol": "複製塊超連結",
   "uploadAssets2CDN": "上傳資料檔到雲端",
   "notSupport1": "不支援跨筆記本進行拖拽",
-  "keymapTip": "快速鍵修改後需要重新開機後才能生效",
+  "keymapTip": "部分快捷鍵修改後需點擊刷新按鈕後才能生效",
+  "keymapTip2": "使用默認快捷鍵",
   "searchLimit": "搜索結果顯示數",
   "searchLimit1": "如果資料量較大，該值請勿配置過大，預設為 <code>64</code>",
   "searchCaseSensitive": "區分大小寫",
diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
index aba2f9baa..ce4d11a51 100644
--- a/app/appearance/langs/zh_CN.json
+++ b/app/appearance/langs/zh_CN.json
@@ -249,7 +249,8 @@
   "copyProtocol": "复制块超链接",
   "uploadAssets2CDN": "上传资源文件到云端",
   "notSupport1": "不支持跨笔记本进行拖拽",
-  "keymapTip": "快捷键修改后需要重新启动后才能生效",
+  "keymapTip": "部分快捷键修改后需点击刷新按钮后才能生效",
+  "keymapTip2": "使用默认快捷键",
   "searchLimit": "搜索结果显示数",
   "searchLimit1": "如果数据量较大，该值请勿配置过大，默认为 <code>64</code>",
   "searchCaseSensitive": "区分大小写",
diff --git a/app/src/assets/scss/_form.scss b/app/src/assets/scss/_form.scss
index 95a9d1dc3..5038a635d 100644
--- a/app/src/assets/scss/_form.scss
+++ b/app/src/assets/scss/_form.scss
@@ -14,7 +14,7 @@
     &-icon {
       position: absolute;
       left: 9px;
-      top: 7px;
+      top: 6px;
       height: 16px;
       width: 16px;
 
diff --git a/app/src/assets/scss/_search.scss b/app/src/assets/scss/_search.scss
index 78b413e97..554709697 100644
--- a/app/src/assets/scss/_search.scss
+++ b/app/src/assets/scss/_search.scss
@@ -11,6 +11,7 @@
       line-height: 32px;
       border-radius: 0;
       padding: 8px 8px 8px 48px !important;
+      box-shadow: none;
     }
 
     .b3-form__icon-icon {
diff --git a/app/src/assets/scss/_text-field.scss b/app/src/assets/scss/_text-field.scss
index c7abec545..fdb22eade 100644
--- a/app/src/assets/scss/_text-field.scss
+++ b/app/src/assets/scss/_text-field.scss
@@ -1,11 +1,12 @@
 .b3-text-field {
-  border: 1px solid var(--b3-theme-on-surface);
+  border: 0;
   border-radius: 4px;
+  box-shadow: inset 0 0 0 1px var(--b3-theme-on-surface);
   padding: 4px 8px;
   line-height: 20px;
   box-sizing: border-box;
   color: var(--b3-theme-on-background);
-  transition: border-color 120ms 0ms cubic-bezier(0, 0, 0.2, 1), box-shadow 120ms 0ms cubic-bezier(0, 0, 0.2, 1);
+  transition: box-shadow 120ms 0ms cubic-bezier(0, 0, 0.2, 1);
   background-color: var(--b3-theme-background);
 
   &:hover {
@@ -13,8 +14,7 @@
   }
 
   &:focus {
-    border-color: var(--b3-theme-primary);
-    box-shadow: 0 0 0 3px var(--b3-theme-primary-lightest);
+    box-shadow: inset 0 0 0 1px var(--b3-theme-primary), 0 0 0 3px var(--b3-theme-primary-lightest);
   }
 
   &[type="color"] {
diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss
index 54c77308c..54f779a19 100644
--- a/app/src/assets/scss/base.scss
+++ b/app/src/assets/scss/base.scss
@@ -338,7 +338,7 @@ progressLoading: 400
     }
   }
 
-  &-keymap .b3-text-field {
+  &-keymap li .b3-text-field {
     width: 124px;
     text-align: center;
   }
diff --git a/app/src/config/keymap.ts b/app/src/config/keymap.ts
index fec0bc605..b94c50dd9 100644
--- a/app/src/config/keymap.ts
+++ b/app/src/config/keymap.ts
@@ -3,6 +3,7 @@ import {Constants} from "../constants";
 import {showMessage} from "../dialog/message";
 import {fetchPost} from "../util/fetch";
 import {ipcRenderer} from "electron";
+import {exportLayout} from "../layout/util";
 
 export const keymap = {
     element: undefined as Element,
@@ -31,12 +32,26 @@ export const keymap = {
         return `<div class="fn__flex b3-label">
     <span class="fn__flex-center">${window.siyuan.languages.keymapTip}</span>
     <span class="fn__flex-1"></span>
+    <button id="keymapRefreshBtn" class="b3-button b3-button--outline fn__flex-center fn__size200">
+        <svg><use xlink:href="#iconRefresh"></use></svg>
+        ${window.siyuan.languages.refresh}
+    </button>
+</div>
+<div class="fn__flex b3-label">
+    <span class="fn__flex-center">${window.siyuan.languages.keymapTip2}</span>
+    <span class="fn__flex-1"></span>
+    <span class="fn__space"></span>
     <button id="keymapResetBtn" class="b3-button b3-button--outline fn__flex-center fn__size200">
         <svg><use xlink:href="#iconUndo"></use></svg>
         ${window.siyuan.languages.reset}
     </button>
 </div>
 <div class="b3-label file-tree config-keymap" id="keymapList">
+    <label class="b3-form__icon" style="display:block;">
+        <svg class="b3-form__icon-icon"><use xlink:href="#iconSearch"></use></svg>
+        <input id="keymapInput" class="b3-form__icon-input b3-text-field fn__block" placeholder="${window.siyuan.languages.search}">
+    </label>
+    <div class="fn__hr"></div>
     <ul class="b3-list b3-list--background">
         <li class="b3-list-item toggle" style="padding-left: 0">
             <span class="b3-list-item__toggle" style="padding-left: 8px"><svg class="b3-list-item__arrow"><use xlink:href="#iconRight"></use></svg></span>
@@ -110,7 +125,30 @@ export const keymap = {
             /// #endif
         });
     },
+    _search(value: string) {
+        keymap.element.querySelectorAll("#keymapList .b3-list-item--hide-action > .b3-list-item__text").forEach(item => {
+            if (item.textContent.indexOf(value) > -1 || value === "") {
+                item.parentElement.classList.remove("fn__none")
+                item.parentElement.parentElement.classList.remove("fn__none")
+            } else {
+                item.parentElement.classList.add("fn__none")
+            }
+        });
+    },
     bindEvent() {
+        keymap.element.querySelector("#keymapRefreshBtn").addEventListener("click", () => {
+            exportLayout(true);
+        });
+        const searchElement = keymap.element.querySelector("#keymapInput") as HTMLInputElement
+        this.element.addEventListener("compositionend", () => {
+            keymap._search(searchElement.value)
+        });
+        searchElement.addEventListener("input", (event: InputEvent) => {
+            if (event.isComposing) {
+                return;
+            }
+            keymap._search(searchElement.value)
+        });
         keymap.element.querySelector("#keymapResetBtn").addEventListener("click", () => {
             window.siyuan.config.keymap = Constants.SIYUAN_KEYMAP;
             fetchPost("/api/setting/setKeymap", {
@@ -156,8 +194,8 @@ export const keymap = {
             }
         });
         let timeout: number;
-        keymapListElement.querySelectorAll("input").forEach(item => {
-            item.addEventListener("keydown", function (event) {
+        keymapListElement.querySelectorAll("ul input").forEach(item => {
+            item.addEventListener("keydown", function (event: KeyboardEvent) {
                 event.stopPropagation();
                 event.preventDefault();
                 let keymapStr = "";
diff --git a/app/src/config/search.ts b/app/src/config/search.ts
index d02ea30f3..6bb2579cb 100644
--- a/app/src/config/search.ts
+++ b/app/src/config/search.ts
@@ -45,7 +45,7 @@ export const initConfigSearch = (element: HTMLElement) => {
             "doc", "headings", "list1", "listItem", "code", "math", "table", "quote", "superBlock", "paragraph"]),
 
         // 快捷键
-        getLang(["keymap"].concat(Object.keys(Constants.SIYUAN_KEYMAP.general))
+        getLang(["keymap", "keymapTip2"].concat(Object.keys(Constants.SIYUAN_KEYMAP.general))
             .concat(Object.keys(Constants.SIYUAN_KEYMAP.editor.general))
             .concat(Object.keys(Constants.SIYUAN_KEYMAP.editor.heading))
             .concat(Object.keys(Constants.SIYUAN_KEYMAP.editor.insert))