diff --git a/packages/desktop/src/components/Navbar.tsx b/packages/desktop/src/components/Navbar.tsx
index 5f30cb8..51c08f0 100644
--- a/packages/desktop/src/components/Navbar.tsx
+++ b/packages/desktop/src/components/Navbar.tsx
@@ -87,7 +87,11 @@ const Navbar = ({
 
         {isSearching && <CircularProgress size={20} />}
 
-        <KeyboardShortcutLabel label={KeyboardShortcuts.search.label} />
+        {searchVal ? (
+          <KeyboardShortcutLabel label={KeyboardShortcuts.escape.label} />
+        ) : (
+          <KeyboardShortcutLabel label={KeyboardShortcuts.search.label} />
+        )}
       </Stack>
 
       <Tooltip title={'Group conversation'}>
diff --git a/packages/desktop/src/components/Terminal.tsx b/packages/desktop/src/components/Terminal.tsx
index 6fa4473..cd0b2e3 100644
--- a/packages/desktop/src/components/Terminal.tsx
+++ b/packages/desktop/src/components/Terminal.tsx
@@ -16,6 +16,7 @@ import { useDebounce, useKeyPressEvent, useRendersCount, useUnmount } from 'reac
 import Conversation from '@nirvana/core/src/models/conversation.model';
 import { ConversationList } from './ConversationList';
 import FooterControls from './FooterControls';
+import { KeyboardShortcuts } from '../util/keyboard';
 import MainPanel from './MainPanel';
 import Navbar from './Navbar';
 import NewConversationDialog from './NewConversationDialog';
@@ -476,7 +477,7 @@ export function TerminalProvider({ children }: { children?: React.ReactNode }) {
     setSearchVal('');
   }, [setSelectedConversationId, setCreateConversationMode, setSearchVal]);
 
-  useKeyPressEvent('Escape', handleEscape);
+  useKeyPressEvent(KeyboardShortcuts.escape.shortcutKey, handleEscape);
 
   return (
     <TerminalContext.Provider