diff --git a/src/layout.tsx b/src/layout.tsx
index 1cccc94..414b8cc 100644
--- a/src/layout.tsx
+++ b/src/layout.tsx
@@ -247,6 +247,22 @@ const TopbarSearch: Component = () => {
 	const location = useLocation();
 	const [query, setQuery] = createSignal('');
 
+	let inputRef: HTMLInputElement | undefined;
+	onMount(() => {
+	  const handler = (e: KeyboardEvent) => {
+	  	if (e.ctrlKey || e.metaKey) return;
+	    if (e.key === "/") {
+	      e.preventDefault();
+	      inputRef?.focus();
+	    } else if (e.key === "Escape") {
+	    	setQuery('');
+	    	inputRef?.blur();
+	    }
+	  }
+	  window.addEventListener("keydown", handler)
+	  onCleanup(() => window.removeEventListener("keydown", handler))
+	});
+
 	createEffect(() => {
 		if (location.pathname !== '/search') {
 			setQuery('');
@@ -268,6 +284,7 @@ const TopbarSearch: Component = () => {
 			<div class="untangled-topbar-search-box">
 				<Search class="size-4 shrink-0 text-gray-400" />
 				<input
+					ref={inputRef}
 					value={query()}
 					onInput={(event) => setQuery(event.currentTarget.value)}
 					placeholder="search..."