diff --git a/app/components/Header/SearchBox.vue b/app/components/Header/SearchBox.vue
index fe40f4696..4aeb910c9 100644
--- a/app/components/Header/SearchBox.vue
+++ b/app/components/Header/SearchBox.vue
@@ -1,7 +1,4 @@
 <script setup lang="ts">
-import { debounce } from 'perfect-debounce'
-import { normalizeSearchParam } from '#shared/utils/url'
-
 withDefaults(
   defineProps<{
     inputClass?: string
@@ -12,80 +9,17 @@ withDefaults(
 )
 
 const emit = defineEmits(['blur', 'focus'])
-
-const router = useRouter()
 const route = useRoute()
-const { searchProvider } = useSearchProvider()
-const searchProviderValue = computed(() => {
-  const p = normalizeSearchParam(route.query.p)
-  if (p === 'npm' || searchProvider.value === 'npm') return 'npm'
-  return 'algolia'
-})
-
 const isSearchFocused = shallowRef(false)
 
 const showSearchBar = computed(() => {
   return route.name !== 'index'
 })
 
-const searchQuery = useGlobalSearchQuery()
-
-// Pages that have their own local filter using ?q
-const pagesWithLocalFilter = new Set(['~username', 'org'])
-
-function updateUrlQueryImpl(value: string, provider: 'npm' | 'algolia') {
-  // Don't navigate away from pages that use ?q for local filtering
-  if (pagesWithLocalFilter.has(route.name as string)) {
-    return
-  }
-  if (route.name === 'search') {
-    router.replace({ query: { q: value || undefined, p: provider === 'npm' ? 'npm' : undefined } })
-    return
-  }
-  if (!value) {
-    return
-  }
-
-  router.push({
-    name: 'search',
-    query: {
-      q: value,
-      p: provider === 'npm' ? 'npm' : undefined,
-    },
-  })
-}
-
-const updateUrlQueryNpm = debounce(updateUrlQueryImpl, 250)
-const updateUrlQueryAlgolia = debounce(updateUrlQueryImpl, 80)
-
-const updateUrlQuery = Object.assign(
-  (value: string) =>
-    (searchProviderValue.value === 'algolia' ? updateUrlQueryAlgolia : updateUrlQueryNpm)(
-      value,
-      searchProviderValue.value,
-    ),
-  {
-    flush: () =>
-      (searchProviderValue.value === 'algolia' ? updateUrlQueryAlgolia : updateUrlQueryNpm).flush(),
-  },
-)
-
-watch(searchQuery, value => {
-  updateUrlQuery(value)
-})
+const { model: searchQuery, flushUpdateUrlQuery } = useGlobalSearch()
 
 function handleSubmit() {
-  if (pagesWithLocalFilter.has(route.name as string)) {
-    router.push({
-      name: 'search',
-      query: {
-        q: searchQuery.value,
-        p: searchProviderValue.value === 'npm' ? 'npm' : undefined,
-      },
-    })
-  } else {
-    updateUrlQuery.flush()
-  }
+  flushUpdateUrlQuery()
 }
 
 // Expose focus method for parent components
diff --git a/app/components/Package/Keywords.vue b/app/components/Package/Keywords.vue
index 2328d0edb..b7252e83d 100644
--- a/app/components/Package/Keywords.vue
+++ b/app/components/Package/Keywords.vue
@@ -2,6 +2,8 @@
 defineProps<{
   keywords?: string[]
 }>()
+
+const { model } = useGlobalSearch()
 </script>
 <template>
   <CollapsibleSection v-if="keywords?.length" :title="$t('package.keywords_title')" id="keywords">
@@ -10,7 +12,8 @@ defineProps<{
         <LinkBase
           variant="button-secondary"
           size="small"
-          :to="{ name: 'search', query: { q: `keywords:${keyword}` } }"
+          :to="{ name: 'search', query: { q: `keyword:${keyword}` } }"
+          @click="model = `keyword:${keyword}`"
         >
           {{ keyword }}
         </LinkBase>
diff --git a/app/composables/useGlobalSearch.ts b/app/composables/useGlobalSearch.ts
new file mode 100644
index 000000000..6ad738872
--- /dev/null
+++ b/app/composables/useGlobalSearch.ts
@@ -0,0 +1,75 @@
+import { normalizeSearchParam } from '#shared/utils/url'
+import { debounce } from 'perfect-debounce'
+
+// Pages that have their own local filter using ?q
+const pagesWithLocalFilter = new Set(['~username', 'org'])
+
+export function useGlobalSearch() {
+  const { searchProvider } = useSearchProvider()
+  const searchProviderValue = computed(() => {
+    const p = normalizeSearchParam(route.query.p)
+    if (p === 'npm' || searchProvider.value === 'npm') return 'npm'
+    return 'algolia'
+  })
+  const router = useRouter()
+  const route = useRoute()
+  const searchQuery = useState<string>('search-query', () => {
+    if (pagesWithLocalFilter.has(route.name as string)) {
+      return ''
+    }
+    return normalizeSearchParam(route.query.q)
+  })
+
+  // clean search input when navigating away from search page
+  watch(
+    () => route.query.q,
+    urlQuery => {
+      const value = normalizeSearchParam(urlQuery)
+      if (!value) searchQuery.value = ''
+    },
+  )
+  const updateUrlQueryImpl = (value: string, provider: 'npm' | 'algolia') => {
+    const isSameQuery = route.query.q === value && route.query.p === provider
+    // Don't navigate away from pages that use ?q for local filtering
+    if (pagesWithLocalFilter.has(route.name as string) || isSameQuery) {
+      return
+    }
+
+    if (route.name === 'search') {
+      router.replace({
+        query: {
+          ...route.query,
+          q: value || undefined,
+          p: provider === 'npm' ? 'npm' : undefined,
+        },
+      })
+      return
+    }
+    router.push({
+      name: 'search',
+      query: {
+        q: value,
+        p: provider === 'npm' ? 'npm' : undefined,
+      },
+    })
+  }
+  const updateUrlQuery = debounce(updateUrlQueryImpl, 250)
+
+  function flushUpdateUrlQuery() {
+    updateUrlQuery.flush()
+  }
+
+  const searchQueryValue = computed({
+    get: () => searchQuery.value,
+    set: async (value: string) => {
+      searchQuery.value = value
+
+      // Leading debounce implementation as it doesn't work properly out of the box (https://github.com/unjs/perfect-debounce/issues/43)
+      if (!updateUrlQuery.isPending()) {
+        updateUrlQueryImpl(value, searchProvider.value)
+      }
+      updateUrlQuery(value, searchProvider.value)
+    },
+  })
+  return { model: searchQueryValue, provider: searchProviderValue, flushUpdateUrlQuery }
+}
diff --git a/app/composables/useGlobalSearchQuery.ts b/app/composables/useGlobalSearchQuery.ts
deleted file mode 100644
index 51f5b7d2d..000000000
--- a/app/composables/useGlobalSearchQuery.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { normalizeSearchParam } from '#shared/utils/url'
-
-export function useGlobalSearchQuery() {
-  const route = useRoute()
-  const searchQuery = useState<string>('search-query', () => normalizeSearchParam(route.query.q))
-
-  // clean search input when navigating away from search page
-  watch(
-    () => route.query.q,
-    urlQuery => {
-      const value = normalizeSearchParam(urlQuery)
-      if (!value) searchQuery.value = ''
-    },
-  )
-  return searchQuery
-}
diff --git a/app/composables/useStructuredFilters.ts b/app/composables/useStructuredFilters.ts
index 19266e1ee..a33d4d150 100644
--- a/app/composables/useStructuredFilters.ts
+++ b/app/composables/useStructuredFilters.ts
@@ -87,6 +87,7 @@ export function hasSearchOperators(parsed: ParsedSearchOperators): boolean {
 
 interface UseStructuredFiltersOptions {
   packages: Ref<NpmSearchResult[]>
+  searchQueryModel?: Ref<string>
   initialFilters?: Partial<StructuredFilters>
   initialSort?: SortOption
 }
@@ -114,7 +115,7 @@ function matchesSecurity(pkg: NpmSearchResult, security: SecurityFilter): boolea
 export function useStructuredFilters(options: UseStructuredFiltersOptions) {
   const route = useRoute()
   const router = useRouter()
-  const { packages, initialFilters, initialSort } = options
+  const { packages, initialFilters, initialSort, searchQueryModel } = options
   const { t } = useI18n()
 
   const searchQuery = shallowRef(normalizeSearchParam(route.query.q))
@@ -404,6 +405,8 @@ export function useStructuredFilters(options: UseStructuredFiltersOptions) {
         ? `${searchQuery.value.trim()} keyword:${keyword}`
         : `keyword:${keyword}`
       router.replace({ query: { ...route.query, q: newQ } })
+
+      if (searchQueryModel) searchQueryModel.value = newQ
     }
   }
 
@@ -411,6 +414,7 @@ export function useStructuredFilters(options: UseStructuredFiltersOptions) {
     filters.value.keywords = filters.value.keywords.filter(k => k !== keyword)
     const newQ = searchQuery.value.replace(new RegExp(`keyword:${keyword}($| )`, 'g'), '').trim()
     router.replace({ query: { ...route.query, q: newQ || undefined } })
+    if (searchQueryModel) searchQueryModel.value = newQ
   }
 
   function toggleKeyword(keyword: string) {
diff --git a/app/pages/index.vue b/app/pages/index.vue
index 35d01f08b..8e087b510 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -1,36 +1,11 @@
 <script setup lang="ts">
-import { debounce } from 'perfect-debounce'
 import { SHOWCASED_FRAMEWORKS } from '~/utils/frameworks'
 
-const { searchProvider } = useSearchProvider()
-
-const searchQuery = useGlobalSearchQuery()
+const { model: searchQuery, flushUpdateUrlQuery } = useGlobalSearch()
 const isSearchFocused = shallowRef(false)
 
 async function search() {
-  const query = searchQuery.value.trim()
-  if (!query) return
-  await navigateTo({
-    path: '/search',
-    query: query ? { q: query, p: searchProvider.value === 'npm' ? 'npm' : undefined } : undefined,
-  })
-  const newQuery = searchQuery.value.trim()
-  if (newQuery !== query) {
-    await search()
-  }
-}
-
-const handleInputNpm = debounce(search, 250, { leading: true, trailing: true })
-const handleInputAlgolia = debounce(search, 80, { leading: true, trailing: true })
-
-function handleInput() {
-  if (isTouchDevice()) {
-    search()
-  } else if (searchProvider.value === 'algolia') {
-    handleInputAlgolia()
-  } else {
-    handleInputNpm()
-  }
+  flushUpdateUrlQuery()
 }
 
 useSeoMeta({
@@ -104,7 +79,6 @@ defineOgImageComponent('Default', {
                   class="w-full ps-8 pe-24"
                   @focus="isSearchFocused = true"
                   @blur="isSearchFocused = false"
-                  @input="handleInput"
                 />
 
                 <ButtonBase
diff --git a/app/pages/search.vue b/app/pages/search.vue
index b1d73029b..e0cf0c9ed 100644
--- a/app/pages/search.vue
+++ b/app/pages/search.vue
@@ -10,13 +10,6 @@ import { normalizeSearchParam } from '#shared/utils/url'
 const route = useRoute()
 const router = useRouter()
 
-const { searchProvider } = useSearchProvider()
-const searchProviderValue = computed(() => {
-  const p = normalizeSearchParam(route.query.p)
-  if (p === 'npm' || searchProvider.value === 'npm') return 'npm'
-  return 'algolia'
-})
-
 // Preferences (persisted to localStorage)
 const {
   viewMode,
@@ -33,12 +26,11 @@ const updateUrlPage = debounce((page: number) => {
     query: {
       ...route.query,
       page: page > 1 ? page : undefined,
-      p: searchProviderValue.value === 'npm' ? 'npm' : undefined,
     },
   })
 }, 500)
 
-const searchQuery = useGlobalSearchQuery()
+const { model: searchQuery, provider: searchProvider } = useGlobalSearch()
 const query = computed(() => searchQuery.value)
 
 // Track if page just loaded (for hiding "Searching..." during view transition)
@@ -131,7 +123,7 @@ const ALL_SORT_KEYS: SortKey[] = [
 
 // Disable sort keys the current provider can't meaningfully sort by
 const disabledSortKeys = computed<SortKey[]>(() => {
-  const supported = PROVIDER_SORT_KEYS[searchProviderValue.value]
+  const supported = PROVIDER_SORT_KEYS[searchProvider.value]
   return ALL_SORT_KEYS.filter(k => !supported.has(k))
 })
 
@@ -155,6 +147,7 @@ const {
     ...parseSearchOperators(normalizeSearchParam(route.query.q)),
   },
   initialSort: 'relevance-desc', // Default to search relevance
+  searchQueryModel: searchQuery,
 })
 
 const isRelevanceSort = computed(
@@ -173,14 +166,14 @@ const requestedSize = computed(() => {
   // When sorting by something other than relevance, fetch a large batch
   // so client-side sorting operates on a meaningful pool of matching results
   if (!isRelevanceSort.value) {
-    const cap = EAGER_LOAD_SIZE[searchProviderValue.value]
+    const cap = EAGER_LOAD_SIZE[searchProvider.value]
     return Math.max(base, cap)
   }
   return base
 })
 
 // Reset to relevance sort when switching to a provider that doesn't support the current sort key
-watch(searchProviderValue, provider => {
+watch(searchProvider, provider => {
   const { key } = parseSortOption(sortOption.value)
   const supported = PROVIDER_SORT_KEYS[provider]
   if (!supported.has(key)) {
@@ -200,7 +193,7 @@ const {
   packageAvailability,
 } = useSearch(
   query,
-  searchProviderValue,
+  searchProvider,
   () => ({
     size: requestedSize.value,
   }),