diff --git a/app/app.vue b/app/app.vue
index 1ea249300..af500571e 100644
--- a/app/app.vue
+++ b/app/app.vue
@@ -47,10 +47,12 @@ if (import.meta.server) {
   setJsonLd(createWebSiteSchema())
 }
 
+const keyboardShortcuts = useKeyboardShortcuts()
+
 onKeyDown(
   '/',
   e => {
-    if (isEditableElement(e.target)) return
+    if (!keyboardShortcuts.value || isEditableElement(e.target)) return
     e.preventDefault()
 
     const searchInput = document.querySelector<HTMLInputElement>(
@@ -70,7 +72,7 @@ onKeyDown(
 onKeyDown(
   '?',
   e => {
-    if (isEditableElement(e.target)) return
+    if (!keyboardShortcuts.value || isEditableElement(e.target)) return
     e.preventDefault()
     showKbdHints.value = true
   },
@@ -80,7 +82,7 @@ onKeyDown(
 onKeyUp(
   '?',
   e => {
-    if (isEditableElement(e.target)) return
+    if (!keyboardShortcuts.value || isEditableElement(e.target)) return
     e.preventDefault()
     showKbdHints.value = false
   },
diff --git a/app/assets/main.css b/app/assets/main.css
index ef87c5050..0de1fb5fc 100644
--- a/app/assets/main.css
+++ b/app/assets/main.css
@@ -335,6 +335,11 @@ input[type='search']::-webkit-search-results-decoration {
   animation-timing-function: cubic-bezier(0.22, 1, 0.36, 1);
 }
 
+/* Hide keyboard shortcut hints before hydration when user disabled them */
+:root[data-kbd-shortcuts='false'] [data-kbd-hint] {
+  display: none;
+}
+
 /* Locking the scroll whenever any of the modals are open */
 html:has(dialog:modal) {
   overflow: hidden;
diff --git a/app/components/AppFooter.vue b/app/components/AppFooter.vue
index ad0c82daf..43ead35e4 100644
--- a/app/components/AppFooter.vue
+++ b/app/components/AppFooter.vue
@@ -6,6 +6,7 @@ const isHome = computed(() => route.name === 'index')
 
 const modalRef = useTemplateRef('modalRef')
 const showModal = () => modalRef.value?.showModal?.()
+const closeModal = () => modalRef.value?.close?.()
 </script>
 
 <template>
@@ -81,7 +82,7 @@ const showModal = () => modalRef.value?.showModal?.()
             <p class="mb-2 font-mono text-fg-subtle">
               {{ $t('shortcuts.section.package') }}
             </p>
-            <ul class="mb-6 flex flex-col gap-2">
+            <ul class="mb-8 flex flex-col gap-2">
               <li class="flex gap-2 items-center">
                 <kbd class="kbd">.</kbd>
                 <span>{{ $t('shortcuts.open_code_view') }}</span>
@@ -95,6 +96,19 @@ const showModal = () => modalRef.value?.showModal?.()
                 <span>{{ $t('shortcuts.compare_from_package') }}</span>
               </li>
             </ul>
+            <p class="text-fg-muted leading-relaxed">
+              <i18n-t keypath="shortcuts.disable_shortcuts" tag="span" scope="global">
+                <template #settings>
+                  <NuxtLink
+                    :to="{ name: 'settings' }"
+                    class="hover:text-fg underline decoration-fg-subtle/50 hover:decoration-fg"
+                    @click="closeModal"
+                  >
+                    {{ $t('settings.title') }}
+                  </NuxtLink>
+                </template>
+              </i18n-t>
+            </p>
           </Modal>
           <LinkBase :to="NPMX_DOCS_SITE">
             {{ $t('footer.docs') }}
diff --git a/app/components/AppHeader.vue b/app/components/AppHeader.vue
index a016389c5..feb5d3341 100644
--- a/app/components/AppHeader.vue
+++ b/app/components/AppHeader.vue
@@ -4,6 +4,8 @@ import type { NavigationConfig, NavigationConfigWithGroups } from '~/types'
 import { isEditableElement } from '~/utils/input'
 import { NPMX_DOCS_SITE } from '#shared/utils/constants'
 
+const keyboardShortcuts = useKeyboardShortcuts()
+
 withDefaults(
   defineProps<{
     showLogo?: boolean
@@ -175,7 +177,7 @@ function handleSearchFocus() {
 
 onKeyStroke(
   e => {
-    if (isEditableElement(e.target)) {
+    if (!keyboardShortcuts.value || isEditableElement(e.target)) {
       return
     }
 
diff --git a/app/components/Button/Base.vue b/app/components/Button/Base.vue
index de4a97936..f37d57be0 100644
--- a/app/components/Button/Base.vue
+++ b/app/components/Button/Base.vue
@@ -26,6 +26,8 @@ const props = withDefaults(
 
 const el = useTemplateRef('el')
 
+const keyboardShortcutsEnabled = useKeyboardShortcuts()
+
 defineExpose({
   focus: () => el.value?.focus(),
   getBoundingClientRect: () => el.value?.getBoundingClientRect(),
@@ -56,12 +58,13 @@ defineExpose({
        */
       disabled ? true : undefined
     "
-    :aria-keyshortcuts="ariaKeyshortcuts"
+    :aria-keyshortcuts="keyboardShortcutsEnabled ? ariaKeyshortcuts : undefined"
   >
     <span v-if="classicon" class="size-[1em]" :class="classicon" aria-hidden="true" />
     <slot />
     <kbd
-      v-if="ariaKeyshortcuts"
+      v-if="keyboardShortcutsEnabled && ariaKeyshortcuts"
+      data-kbd-hint
       class="ms-2 inline-flex items-center justify-center w-4 h-4 text-xs text-fg bg-bg-muted border border-border rounded no-underline"
       aria-hidden="true"
     >
diff --git a/app/components/Link/Base.vue b/app/components/Link/Base.vue
index 16c3d310d..3e8cac4cf 100644
--- a/app/components/Link/Base.vue
+++ b/app/components/Link/Base.vue
@@ -59,6 +59,7 @@ const isLink = computed(() => props.variant === 'link')
 const isButton = computed(() => !isLink.value)
 const isButtonSmall = computed(() => props.size === 'small' && !isLink.value)
 const isButtonMedium = computed(() => props.size === 'medium' && !isLink.value)
+const keyboardShortcutsEnabled = useKeyboardShortcuts()
 </script>
 
 <template>
@@ -97,7 +98,7 @@ const isButtonMedium = computed(() => props.size === 'medium' && !isLink.value)
         variant === 'button-primary',
     }"
     :to="to"
-    :aria-keyshortcuts="ariaKeyshortcuts"
+    :aria-keyshortcuts="keyboardShortcutsEnabled ? ariaKeyshortcuts : undefined"
     :target="isLinkExternal ? '_blank' : undefined"
   >
     <span v-if="classicon" class="size-[1em]" :class="classicon" aria-hidden="true" />
@@ -114,7 +115,8 @@ const isButtonMedium = computed(() => props.size === 'medium' && !isLink.value)
       aria-hidden="true"
     />
     <kbd
-      v-if="ariaKeyshortcuts"
+      v-if="keyboardShortcutsEnabled && ariaKeyshortcuts"
+      data-kbd-hint
       class="ms-2 inline-flex items-center justify-center size-4 text-xs text-fg bg-bg-muted border border-border rounded no-underline"
       aria-hidden="true"
     >
diff --git a/app/composables/useSettings.ts b/app/composables/useSettings.ts
index d3c3cd46e..5e45b4218 100644
--- a/app/composables/useSettings.ts
+++ b/app/composables/useSettings.ts
@@ -29,6 +29,8 @@ export interface AppSettings {
   selectedLocale: LocaleObject['code'] | null
   /** Search provider for package search */
   searchProvider: SearchProvider
+  /** Enable/disable keyboard shortcuts */
+  keyboardShortcuts: boolean
   /** Connector preferences */
   connector: {
     /** Automatically open the web auth page in the browser */
@@ -53,6 +55,7 @@ const DEFAULT_SETTINGS: AppSettings = {
   selectedLocale: null,
   preferredBackgroundTheme: null,
   searchProvider: import.meta.test ? 'npm' : 'algolia',
+  keyboardShortcuts: true,
   connector: {
     autoOpenURL: false,
   },
@@ -97,6 +100,31 @@ export function useRelativeDates() {
   return computed(() => settings.value.relativeDates)
 }
 
+/**
+ * Composable for accessing just the keyboard shortcuts setting.
+ * Useful for components that only need to read this specific setting.
+ */
+export const useKeyboardShortcuts = createSharedComposable(function useKeyboardShortcuts() {
+  const { settings } = useSettings()
+  const enabled = computed(() => settings.value.keyboardShortcuts)
+
+  if (import.meta.client) {
+    watch(
+      enabled,
+      value => {
+        if (value) {
+          delete document.documentElement.dataset.kbdShortcuts
+        } else {
+          document.documentElement.dataset.kbdShortcuts = 'false'
+        }
+      },
+      { immediate: true },
+    )
+  }
+
+  return enabled
+})
+
 /**
  * Composable for managing accent color.
  */
diff --git a/app/pages/package/[[org]]/[name].vue b/app/pages/package/[[org]]/[name].vue
index d0e5474e0..21f32ed84 100644
--- a/app/pages/package/[[org]]/[name].vue
+++ b/app/pages/package/[[org]]/[name].vue
@@ -688,8 +688,10 @@ const codeLink = computed((): RouteLocationRaw | null => {
   }
 })
 
+const keyboardShortcuts = useKeyboardShortcuts()
+
 onKeyStroke(
-  e => isKeyWithoutModifiers(e, '.') && !isEditableElement(e.target),
+  e => keyboardShortcuts.value && isKeyWithoutModifiers(e, '.') && !isEditableElement(e.target),
   e => {
     if (codeLink.value === null) return
     e.preventDefault()
@@ -700,7 +702,7 @@ onKeyStroke(
 )
 
 onKeyStroke(
-  e => isKeyWithoutModifiers(e, 'd') && !isEditableElement(e.target),
+  e => keyboardShortcuts.value && isKeyWithoutModifiers(e, 'd') && !isEditableElement(e.target),
   e => {
     if (!docsLink.value) return
     e.preventDefault()
@@ -710,7 +712,7 @@ onKeyStroke(
 )
 
 onKeyStroke(
-  e => isKeyWithoutModifiers(e, 'c') && !isEditableElement(e.target),
+  e => keyboardShortcuts.value && isKeyWithoutModifiers(e, 'c') && !isEditableElement(e.target),
   e => {
     if (!pkg.value) return
     e.preventDefault()
diff --git a/app/pages/settings.vue b/app/pages/settings.vue
index 0b44449fd..ee158c3e4 100644
--- a/app/pages/settings.vue
+++ b/app/pages/settings.vue
@@ -5,10 +5,12 @@ const { settings } = useSettings()
 const { locale, locales, setLocale: setNuxti18nLocale } = useI18n()
 const colorMode = useColorMode()
 const { currentLocaleStatus, isSourceLocale } = useI18nStatus()
+const keyboardShortcutsEnabled = useKeyboardShortcuts()
 
 // Escape to go back (but not when focused on form elements or modal is open)
 onKeyStroke(
   e =>
+    keyboardShortcutsEnabled.value &&
     isKeyWithoutModifiers(e, 'Escape') &&
     !isEditableElement(e.target) &&
     !document.documentElement.matches('html:has(:modal)'),
@@ -205,6 +207,7 @@ const setLocale: typeof setNuxti18nLocale = locale => {
           </div>
         </section>
 
+        <!-- LANGUAGE Section -->
         <section>
           <h2 class="text-xs text-fg-muted uppercase tracking-wider mb-4">
             {{ $t('settings.sections.language') }}
@@ -260,6 +263,20 @@ const setLocale: typeof setNuxti18nLocale = locale => {
             </template>
           </div>
         </section>
+
+        <!-- KEYBOARD SHORTCUTS Section -->
+        <section>
+          <h2 class="text-xs text-fg-muted uppercase tracking-wider mb-4">
+            {{ $t('settings.sections.keyboard_shortcuts') }}
+          </h2>
+          <div class="bg-bg-subtle border border-border rounded-lg p-4 sm:p-6">
+            <SettingsToggle
+              :label="$t('settings.keyboard_shortcuts_enabled')"
+              :description="$t('settings.keyboard_shortcuts_enabled_description')"
+              v-model="settings.keyboardShortcuts"
+            />
+          </div>
+        </section>
       </div>
     </article>
   </main>
diff --git a/app/utils/prehydrate.ts b/app/utils/prehydrate.ts
index cc6f88e1d..783d21e3e 100644
--- a/app/utils/prehydrate.ts
+++ b/app/utils/prehydrate.ts
@@ -53,5 +53,10 @@ export function initPreferencesOnPrehydrate() {
     document.documentElement.dataset.pm = pm
 
     document.documentElement.dataset.collapsed = settings.sidebar?.collapsed?.join(' ') ?? ''
+
+    // Keyboard shortcuts (default: true)
+    if (settings.keyboardShortcuts === false) {
+      document.documentElement.dataset.kbdShortcuts = 'false'
+    }
   })
 }
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index ef71c6845..ffa4c9c5e 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -33,7 +33,8 @@
     "navigate_results": "Navigate results",
     "go_to_result": "Go to result",
     "open_code_view": "Open code view",
-    "open_docs": "Open docs"
+    "open_docs": "Open docs",
+    "disable_shortcuts": "You can disable keyboard shortcuts in {settings}."
   },
   "search": {
     "label": "Search npm packages",
@@ -84,7 +85,8 @@
       "appearance": "Appearance",
       "display": "Display",
       "search": "Data source",
-      "language": "Language"
+      "language": "Language",
+      "keyboard_shortcuts": "Keyboard shortcuts"
     },
     "data_source": {
       "label": "Data source",
@@ -108,7 +110,9 @@
     "accent_colors": "Accent colors",
     "clear_accent": "Clear accent color",
     "translation_progress": "Translation progress",
-    "background_themes": "Background shade"
+    "background_themes": "Background shade",
+    "keyboard_shortcuts_enabled": "Enable keyboard shortcuts",
+    "keyboard_shortcuts_enabled_description": "Keyboard shortcuts can be disabled if they conflict with other browser or system shortcuts"
   },
   "i18n": {
     "missing_keys": "{count} missing translation | {count} missing translations",
diff --git a/i18n/schema.json b/i18n/schema.json
index 5a58fc1b5..8a26a2584 100644
--- a/i18n/schema.json
+++ b/i18n/schema.json
@@ -105,6 +105,9 @@
         },
         "open_docs": {
           "type": "string"
+        },
+        "disable_shortcuts": {
+          "type": "string"
         }
       },
       "additionalProperties": false
@@ -258,6 +261,9 @@
             },
             "language": {
               "type": "string"
+            },
+            "keyboard_shortcuts": {
+              "type": "string"
             }
           },
           "additionalProperties": false
@@ -330,6 +336,12 @@
         },
         "background_themes": {
           "type": "string"
+        },
+        "keyboard_shortcuts_enabled": {
+          "type": "string"
+        },
+        "keyboard_shortcuts_enabled_description": {
+          "type": "string"
         }
       },
       "additionalProperties": false
diff --git a/lunaria/files/en-GB.json b/lunaria/files/en-GB.json
index d6b2fefca..093f2502a 100644
--- a/lunaria/files/en-GB.json
+++ b/lunaria/files/en-GB.json
@@ -32,7 +32,8 @@
     "navigate_results": "Navigate results",
     "go_to_result": "Go to result",
     "open_code_view": "Open code view",
-    "open_docs": "Open docs"
+    "open_docs": "Open docs",
+    "disable_shortcuts": "You can disable keyboard shortcuts in {settings}."
   },
   "search": {
     "label": "Search npm packages",
@@ -83,7 +84,8 @@
       "appearance": "Appearance",
       "display": "Display",
       "search": "Data source",
-      "language": "Language"
+      "language": "Language",
+      "keyboard_shortcuts": "Keyboard shortcuts"
     },
     "data_source": {
       "label": "Data source",
@@ -107,7 +109,9 @@
     "accent_colors": "Accent colors",
     "clear_accent": "Clear accent colour",
     "translation_progress": "Translation progress",
-    "background_themes": "Background shade"
+    "background_themes": "Background shade",
+    "keyboard_shortcuts_enabled": "Enable keyboard shortcuts",
+    "keyboard_shortcuts_enabled_description": "Keyboard shortcuts can be disabled if they conflict with other browser or system shortcuts"
   },
   "i18n": {
     "missing_keys": "{count} missing translation | {count} missing translations",
diff --git a/lunaria/files/en-US.json b/lunaria/files/en-US.json
index 899428e68..bc965d507 100644
--- a/lunaria/files/en-US.json
+++ b/lunaria/files/en-US.json
@@ -32,7 +32,8 @@
     "navigate_results": "Navigate results",
     "go_to_result": "Go to result",
     "open_code_view": "Open code view",
-    "open_docs": "Open docs"
+    "open_docs": "Open docs",
+    "disable_shortcuts": "You can disable keyboard shortcuts in {settings}."
   },
   "search": {
     "label": "Search npm packages",
@@ -83,7 +84,8 @@
       "appearance": "Appearance",
       "display": "Display",
       "search": "Data source",
-      "language": "Language"
+      "language": "Language",
+      "keyboard_shortcuts": "Keyboard shortcuts"
     },
     "data_source": {
       "label": "Data source",
@@ -107,7 +109,9 @@
     "accent_colors": "Accent colors",
     "clear_accent": "Clear accent color",
     "translation_progress": "Translation progress",
-    "background_themes": "Background shade"
+    "background_themes": "Background shade",
+    "keyboard_shortcuts_enabled": "Enable keyboard shortcuts",
+    "keyboard_shortcuts_enabled_description": "Keyboard shortcuts can be disabled if they conflict with other browser or system shortcuts"
   },
   "i18n": {
     "missing_keys": "{count} missing translation | {count} missing translations",
diff --git a/test/e2e/interactions.spec.ts b/test/e2e/interactions.spec.ts
index b900bbafa..330b1e3f2 100644
--- a/test/e2e/interactions.spec.ts
+++ b/test/e2e/interactions.spec.ts
@@ -223,19 +223,52 @@ test.describe('Keyboard Shortcuts', () => {
     await page.keyboard.press('ControlOrMeta+Shift+,')
     await expect(page).toHaveURL(/\/settings/)
   })
+})
 
-  test('"," does not navigate when search input is focused', async ({ page, goto }) => {
-    await goto('/compare', { waitUntil: 'hydration' })
+test.describe('Keyboard Shortcuts disabled', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.addInitScript(() => {
+      localStorage.setItem('npmx-settings', JSON.stringify({ keyboardShortcuts: false }))
+    })
+  })
 
-    const searchInput = page.locator('#header-search')
-    await searchInput.focus()
-    await expect(searchInput).toBeFocused()
+  test('"," (header) does not navigate to /settings when shortcuts are disabled', async ({
+    page,
+    goto,
+  }) => {
+    await goto('/compare', { waitUntil: 'hydration' })
 
     await page.keyboard.press(',')
 
-    // Should still be on compare, not navigated to settings
     await expect(page).toHaveURL(/\/compare/)
-    // The ',' should have been typed into the input
-    await expect(searchInput).toHaveValue(',')
+  })
+
+  test('"/" (global) does not focus search input when shortcuts are disabled', async ({
+    page,
+    goto,
+  }) => {
+    await goto('/search?q=vue', { waitUntil: 'hydration' })
+
+    await expect(page.locator('text=/found \\d+|showing \\d+/i').first()).toBeVisible({
+      timeout: 15000,
+    })
+
+    // Focus a non-input element so "/" would normally steal focus to search
+    await page.locator('[data-result-index="0"]').first().focus()
+
+    await page.keyboard.press('/')
+
+    await expect(page.locator('input[type="search"]')).not.toBeFocused()
+  })
+
+  test('"d" (package) does not navigate to docs when shortcuts are disabled', async ({
+    page,
+    goto,
+  }) => {
+    await goto('/package/vue', { waitUntil: 'hydration' })
+
+    await page.keyboard.press('d')
+
+    await expect(page).toHaveURL(/\/package\/vue$/)
   })
 })
diff --git a/test/nuxt/composables/use-settings.spec.ts b/test/nuxt/composables/use-settings.spec.ts
new file mode 100644
index 000000000..9234d5949
--- /dev/null
+++ b/test/nuxt/composables/use-settings.spec.ts
@@ -0,0 +1,48 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+describe('useSettings - keyboardShortcuts', () => {
+  beforeEach(() => {
+    vi.resetModules()
+  })
+
+  describe('default value', () => {
+    it('should default keyboardShortcuts to true', async () => {
+      const { useSettings } = await import('../../../app/composables/useSettings')
+      const { settings } = useSettings()
+      expect(settings.value.keyboardShortcuts).toBe(true)
+    })
+  })
+
+  describe('useKeyboardShortcuts composable', () => {
+    it('should return true by default', async () => {
+      const { useKeyboardShortcuts } = await import('../../../app/composables/useSettings')
+      const enabled = useKeyboardShortcuts()
+      expect(enabled.value).toBe(true)
+    })
+
+    it('should reflect changes made via settings', async () => {
+      const { useSettings } = await import('../../../app/composables/useSettings')
+      const { useKeyboardShortcuts } = await import('../../../app/composables/useSettings')
+      const { settings } = useSettings()
+      const enabled = useKeyboardShortcuts()
+
+      settings.value.keyboardShortcuts = false
+      expect(enabled.value).toBe(false)
+
+      settings.value.keyboardShortcuts = true
+      expect(enabled.value).toBe(true)
+    })
+
+    it('should be reactive', async () => {
+      const { useSettings } = await import('../../../app/composables/useSettings')
+      const { useKeyboardShortcuts } = await import('../../../app/composables/useSettings')
+      const { settings } = useSettings()
+      const enabled = useKeyboardShortcuts()
+
+      expect(enabled.value).toBe(true)
+
+      settings.value.keyboardShortcuts = false
+      expect(enabled.value).toBe(false)
+    })
+  })
+})