diff --git a/packages/client/src/components/panels/HotkeysPanel/index.js b/packages/client/src/components/panels/HotkeysPanel/index.js
index f9b00ae3fb..2c5fbd5d67 100644
--- a/packages/client/src/components/panels/HotkeysPanel/index.js
+++ b/packages/client/src/components/panels/HotkeysPanel/index.js
@@ -45,6 +45,7 @@ const HotkeyPanel = ({
     (e.key === "Esc" || e.key === "Escape") && onClose();
 
     useEffect(() => {
+      scrollRef.current && scrollRef?.current?.view.focus();
       document.addEventListener("keyup", onKeyPress);
 
       return () => document.removeEventListener("keyup", onKeyPress);