diff --git a/web/components/custom/Shortcut/shortcut.tsx b/web/components/custom/Shortcut/shortcut.tsx
index e4bd5fc6..a8918077 100644
--- a/web/components/custom/Shortcut/shortcut.tsx
+++ b/web/components/custom/Shortcut/shortcut.tsx
@@ -131,6 +131,7 @@ export function Shortcut() {
 						<form className="relative flex items-center">
 							<LaIcon name="Search" className="text-muted-foreground absolute left-3 size-4" />
 							<Input
+								autoFocus
 								placeholder="Search shortcuts"
 								className="border-muted-foreground/50 focus-visible:border-muted-foreground h-10 pl-10 focus-visible:ring-0"
 								value={searchQuery}
diff --git a/web/components/routes/link/list.tsx b/web/components/routes/link/list.tsx
index dfd10cd5..4a4f1f49 100644
--- a/web/components/routes/link/list.tsx
+++ b/web/components/routes/link/list.tsx
@@ -25,6 +25,8 @@ import { useConfirm } from "@omit/react-confirm-dialog"
 import { useLinkActions } from "./hooks/use-link-actions"
 import { isDeleteConfirmShownAtom } from "./LinkRoute"
 import { useActiveItemScroll } from "@/hooks/use-active-item-scroll"
+import { useKeyboardManager } from "@/hooks/use-keyboard-manager"
+import { useKeydownListener } from "@/hooks/use-keydown-listener"
 
 interface LinkListProps {
 	activeItemIndex: number | null
@@ -131,59 +133,52 @@ const LinkList: React.FC<LinkListProps> = ({ activeItemIndex, setActiveItemIndex
 		})
 	}, [])
 
-	useEffect(() => {
-		const handleKeyDown = (e: KeyboardEvent) => {
-			if (isCommandPalettePpen || !me?.root?.personalLinks || sortedLinks.length === 0 || editId !== null) return
+	const { isKeyboardDisabled } = useKeyboardManager("XComponent")
 
-			if (e.key === "ArrowUp" || e.key === "ArrowDown") {
-				e.preventDefault()
-				setActiveItemIndex(prevIndex => {
-					if (prevIndex === null) return 0
-					const newIndex =
-						e.key === "ArrowUp" ? Math.max(0, prevIndex - 1) : Math.min(sortedLinks.length - 1, prevIndex + 1)
+	useKeydownListener((e: KeyboardEvent) => {
+		if (
+			isKeyboardDisabled ||
+			isCommandPalettePpen ||
+			!me?.root?.personalLinks ||
+			sortedLinks.length === 0 ||
+			editId !== null
+		)
+			return
 
-					if (e.metaKey && sort === "manual") {
-						const linksArray = [...me.root.personalLinks]
-						const newLinks = arrayMove(linksArray, prevIndex, newIndex)
+		if (e.key === "ArrowUp" || e.key === "ArrowDown") {
+			e.preventDefault()
+			setActiveItemIndex(prevIndex => {
+				if (prevIndex === null) return 0
+				const newIndex =
+					e.key === "ArrowUp" ? Math.max(0, prevIndex - 1) : Math.min(sortedLinks.length - 1, prevIndex + 1)
 
-						while (me.root.personalLinks.length > 0) {
-							me.root.personalLinks.pop()
-						}
+				if (e.metaKey && sort === "manual") {
+					const linksArray = [...me.root.personalLinks]
+					const newLinks = arrayMove(linksArray, prevIndex, newIndex)
 
-						newLinks.forEach(link => {
-							if (link) {
-								me.root.personalLinks.push(link)
-							}
-						})
-
-						updateSequences(me.root.personalLinks)
+					while (me.root.personalLinks.length > 0) {
+						me.root.personalLinks.pop()
 					}
 
-					return newIndex
-				})
-			} else if (e.key === "Enter" && !disableEnterKey && activeItemIndex !== null) {
-				e.preventDefault()
-				const activeLink = sortedLinks[activeItemIndex]
-				if (activeLink) {
-					setEditId(activeLink.id)
+					newLinks.forEach(link => {
+						if (link) {
+							me.root.personalLinks.push(link)
+						}
+					})
+
+					updateSequences(me.root.personalLinks)
 				}
+
+				return newIndex
+			})
+		} else if (e.key === "Enter" && !disableEnterKey && activeItemIndex !== null) {
+			e.preventDefault()
+			const activeLink = sortedLinks[activeItemIndex]
+			if (activeLink) {
+				setEditId(activeLink.id)
 			}
 		}
-
-		window.addEventListener("keydown", handleKeyDown)
-		return () => window.removeEventListener("keydown", handleKeyDown)
-	}, [
-		me?.root?.personalLinks,
-		sortedLinks,
-		editId,
-		sort,
-		updateSequences,
-		isCommandPalettePpen,
-		activeItemIndex,
-		setEditId,
-		setActiveItemIndex,
-		disableEnterKey
-	])
+	})
 
 	const handleDragStart = useCallback(
 		(event: DragStartEvent) => {
diff --git a/web/hooks/use-keyboard-manager.ts b/web/hooks/use-keyboard-manager.ts
index bd8c34de..f73d0994 100644
--- a/web/hooks/use-keyboard-manager.ts
+++ b/web/hooks/use-keyboard-manager.ts
@@ -2,19 +2,31 @@ import { useAtom } from "jotai"
 import { useEffect, useCallback } from "react"
 import { keyboardDisableSourcesAtom } from "@/store/keydown-manager"
 
+const allowedKeys = ["Escape", "ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"]
+
 export function useKeyboardManager(sourceId: string) {
 	const [disableSources, setDisableSources] = useAtom(keyboardDisableSourcesAtom)
 
 	useEffect(() => {
 		const handleKeyDown = (event: KeyboardEvent) => {
-			if (disableSources.size > 0) {
-				event.preventDefault()
+			if (disableSources.has(sourceId)) {
+				if (allowedKeys.includes(event.key)) {
+					if (event.key === "Escape") {
+						setDisableSources(prev => {
+							const next = new Set(prev)
+							next.delete(sourceId)
+							return next
+						})
+					}
+				} else {
+					event.stopPropagation()
+				}
 			}
 		}
 
-		window.addEventListener("keydown", handleKeyDown)
-		return () => window.removeEventListener("keydown", handleKeyDown)
-	}, [disableSources])
+		window.addEventListener("keydown", handleKeyDown, true)
+		return () => window.removeEventListener("keydown", handleKeyDown, true)
+	}, [disableSources, sourceId, setDisableSources])
 
 	const disableKeydown = useCallback(
 		(disable: boolean) => {
@@ -32,7 +44,7 @@ export function useKeyboardManager(sourceId: string) {
 		[setDisableSources, sourceId]
 	)
 
-	const isKeyboardDisabled = disableSources.size > 0
+	const isKeyboardDisabled = disableSources.has(sourceId)
 
 	return { disableKeydown, isKeyboardDisabled }
 }