diff --git a/app/electron/main.js b/app/electron/main.js
index 763dd4c70..33a9f230d 100644
--- a/app/electron/main.js
+++ b/app/electron/main.js
@@ -124,7 +124,8 @@ const hotKey2Electron = (key) => {
         electronKey += "Alt+";
     }
     return electronKey + key.replace("⌘", "").replace("⇧", "").replace("⌥", "").replace("⌃", "")
-        .replace("←", "Left").replace("→", "Right").replace("↑", "Up").replace("↓", "Down");
+        .replace("←", "Left").replace("→", "Right").replace("↑", "Up").replace("↓", "Down").replace(" ", "Space")
+        .replace("+", "Plus").replace("⇥", "Tab").replace("⌫", "Backspace").replace("⌦", "Delete").replace("↩", "Return");
 };
 
 /**
diff --git a/app/src/config/keymap.ts b/app/src/config/keymap.ts
index 63aefa95e..8d3431630 100644
--- a/app/src/config/keymap.ts
+++ b/app/src/config/keymap.ts
@@ -370,6 +370,7 @@ export const keymap = {
         keymap.element.querySelector("#clearSearchBtn").addEventListener("click", () => {
             searchElement.value = "";
             searchKeymapElement.value = "";
+            searchKeymapElement.dataset.keymap = "";
             keymap.search("", "");
         });
         keymap.element.querySelector("#keymapResetBtn").addEventListener("click", () => {