diff --git a/app/app.vue b/app/app.vue
index 5916e3e328..26c409c88f 100644
--- a/app/app.vue
+++ b/app/app.vue
@@ -50,6 +50,8 @@ if (import.meta.server) {
 const keyboardShortcuts = useKeyboardShortcuts()
 const { settings } = useSettings()
 
+initKeyShortcuts()
+
 onKeyDown(
   '/',
   e => {
diff --git a/app/components/AppHeader.vue b/app/components/AppHeader.vue
index 1ccfc31d40..7d0ffeda71 100644
--- a/app/components/AppHeader.vue
+++ b/app/components/AppHeader.vue
@@ -1,10 +1,8 @@
 <script setup lang="ts">
 import { LinkBase } from '#components'
 import type { NavigationConfig, NavigationConfigWithGroups } from '~/types'
-import { isEditableElement } from '~/utils/input'
 import { NPMX_DOCS_SITE } from '#shared/utils/constants'
 
-const keyboardShortcuts = useKeyboardShortcuts()
 const discord = useDiscordLink()
 
 withDefaults(
@@ -200,22 +198,10 @@ function handleSearchFocus() {
   showFullSearch.value = true
 }
 
-onKeyStroke(
-  e => {
-    if (!keyboardShortcuts.value || isEditableElement(e.target)) {
-      return
-    }
-
-    for (const link of desktopLinks.value) {
-      if (link.to && link.keyshortcut && isKeyWithoutModifiers(e, link.keyshortcut)) {
-        e.preventDefault()
-        navigateTo(link.to)
-        break
-      }
-    }
-  },
-  { dedupe: true },
-)
+useShortcuts({
+  'c': () => ({ name: 'compare' }),
+  ',': () => ({ name: 'settings' }),
+})
 </script>
 
 <template>
diff --git a/app/components/Package/Header.vue b/app/components/Package/Header.vue
index 7cf6b4c8bc..e0aeab97be 100644
--- a/app/components/Package/Header.vue
+++ b/app/components/Package/Header.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import type { RouteLocationRaw } from 'vue-router'
 import { SCROLL_TO_TOP_THRESHOLD } from '~/composables/useScrollToTop'
-import { isEditableElement } from '~/utils/input'
 
 const props = defineProps<{
   pkg?: Pick<SlimPackument, 'name' | 'versions' | 'dist-tags'> | null
@@ -72,7 +71,6 @@ function hasProvenance(version: PackumentVersion | null): boolean {
   return !!(version.dist as { attestations?: unknown }).attestations
 }
 
-const router = useRouter()
 // Docs URL: use our generated API docs
 const docsLink = computed(() => {
   if (!props.resolvedVersion) return null
@@ -120,59 +118,13 @@ const diffLink = computed((): RouteLocationRaw | null => {
   return diffRoute(props.pkg.name, props.resolvedVersion, props.latestVersion.version)
 })
 
-const keyboardShortcuts = useKeyboardShortcuts()
-
-onKeyStroke(
-  e => keyboardShortcuts.value && isKeyWithoutModifiers(e, '.') && !isEditableElement(e.target),
-  e => {
-    if (codeLink.value === null) return
-    e.preventDefault()
-
-    navigateTo(codeLink.value)
-  },
-  { dedupe: true },
-)
-
-onKeyStroke(
-  e => keyboardShortcuts.value && isKeyWithoutModifiers(e, 'm') && !isEditableElement(e.target),
-  e => {
-    if (mainLink.value === null) return
-    e.preventDefault()
-
-    navigateTo(mainLink.value)
-  },
-  { dedupe: true },
-)
-
-onKeyStroke(
-  e => keyboardShortcuts.value && isKeyWithoutModifiers(e, 'd') && !isEditableElement(e.target),
-  e => {
-    if (!docsLink.value) return
-    e.preventDefault()
-    navigateTo(docsLink.value)
-  },
-  { dedupe: true },
-)
-
-onKeyStroke(
-  e => keyboardShortcuts.value && isKeyWithoutModifiers(e, 'c') && !isEditableElement(e.target),
-  e => {
-    if (!props.pkg) return
-    e.preventDefault()
-    router.push({ name: 'compare', query: { packages: props.pkg.name } })
-  },
-  { dedupe: true },
-)
-
-onKeyStroke(
-  e => keyboardShortcuts.value && isKeyWithoutModifiers(e, 'f') && !isEditableElement(e.target),
-  e => {
-    if (diffLink.value === null) return
-    e.preventDefault()
-    navigateTo(diffLink.value)
-  },
-  { dedupe: true },
-)
+useShortcuts({
+  '.': () => codeLink.value,
+  'm': () => mainLink.value,
+  'd': () => docsLink.value,
+  'c': () => props.pkg && { name: 'compare' as const, query: { packages: props.pkg.name } },
+  'f': () => diffLink.value,
+})
 
 const fundingUrl = computed(() => {
   let funding = props.displayVersion?.funding
diff --git a/app/composables/useShortcuts.ts b/app/composables/useShortcuts.ts
new file mode 100644
index 0000000000..c1ac793265
--- /dev/null
+++ b/app/composables/useShortcuts.ts
@@ -0,0 +1,47 @@
+import type { RouteLocationRaw } from 'vue-router'
+import { isEditableElement, isKeyWithoutModifiers } from '~/utils/input'
+
+type ShortcutTarget = RouteLocationRaw | null | undefined
+type ShortcutTargetFactory = () => ShortcutTarget
+
+const registry = new Map<string, ShortcutTargetFactory[]>()
+
+export function initKeyShortcuts() {
+  const keyboardShortcuts = useKeyboardShortcuts()
+
+  onKeyStroke(
+    e => !e.repeat && keyboardShortcuts.value && !isEditableElement(e.target),
+    e => {
+      for (const [key, stack] of registry) {
+        if (!isKeyWithoutModifiers(e, key)) continue
+        const getTarget = stack.at(-1)
+        if (!getTarget) continue
+        const target = getTarget()
+        if (!target) return
+        e.preventDefault()
+        navigateTo(target)
+        return
+      }
+    },
+  )
+}
+
+export function useShortcuts(map: Record<string, () => ShortcutTarget>) {
+  if (!import.meta.client) return
+
+  for (const [key, fn] of Object.entries(map)) {
+    const entry = registry.get(key) ?? []
+    if (entry.includes(fn)) continue
+    entry.push(fn)
+    registry.set(key, entry)
+  }
+
+  onScopeDispose(() => {
+    for (const [key, fn] of Object.entries(map)) {
+      const stack = registry.get(key)
+      if (!stack) continue
+      const idx = stack.lastIndexOf(fn)
+      if (idx !== -1) stack.splice(idx, 1)
+    }
+  })
+}