diff --git a/app/components/Compare/PackageSelector.vue b/app/components/Compare/PackageSelector.vue
index efcce9877..6475c9c3e 100644
--- a/app/components/Compare/PackageSelector.vue
+++ b/app/components/Compare/PackageSelector.vue
@@ -15,7 +15,8 @@ const inputValue = shallowRef('')
 const isInputFocused = shallowRef(false)
 
 // Use the shared search composable (supports both npm and Algolia providers)
-const { data: searchData, status } = useSearch(inputValue, { size: 15 })
+const { searchProvider } = useSearchProvider()
+const { data: searchData, status } = useSearch(inputValue, searchProvider, { size: 15 })
 
 const isSearching = computed(() => status.value === 'pending')
 
diff --git a/app/components/Header/SearchBox.vue b/app/components/Header/SearchBox.vue
index 51e2c3567..d9b5adf4d 100644
--- a/app/components/Header/SearchBox.vue
+++ b/app/components/Header/SearchBox.vue
@@ -15,7 +15,12 @@ const emit = defineEmits(['blur', 'focus'])
 
 const router = useRouter()
 const route = useRoute()
-const { isAlgolia } = useSearchProvider()
+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)
 
@@ -29,13 +34,13 @@ const searchQuery = shallowRef(normalizeSearchParam(route.query.q))
 // Pages that have their own local filter using ?q
 const pagesWithLocalFilter = new Set(['~username', 'org'])
 
-function updateUrlQueryImpl(value: string) {
+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 } })
+    router.replace({ query: { q: value || undefined, p: provider === 'npm' ? 'npm' : undefined } })
     return
   }
   if (!value) {
@@ -46,6 +51,7 @@ function updateUrlQueryImpl(value: string) {
     name: 'search',
     query: {
       q: value,
+      p: provider === 'npm' ? 'npm' : undefined,
     },
   })
 }
@@ -54,9 +60,14 @@ const updateUrlQueryNpm = debounce(updateUrlQueryImpl, 250)
 const updateUrlQueryAlgolia = debounce(updateUrlQueryImpl, 80)
 
 const updateUrlQuery = Object.assign(
-  (value: string) => (isAlgolia.value ? updateUrlQueryAlgolia : updateUrlQueryNpm)(value),
+  (value: string) =>
+    (searchProviderValue.value === 'algolia' ? updateUrlQueryAlgolia : updateUrlQueryNpm)(
+      value,
+      searchProviderValue.value,
+    ),
   {
-    flush: () => (isAlgolia.value ? updateUrlQueryAlgolia : updateUrlQueryNpm).flush(),
+    flush: () =>
+      (searchProviderValue.value === 'algolia' ? updateUrlQueryAlgolia : updateUrlQueryNpm).flush(),
   },
 )
 
@@ -85,6 +96,7 @@ function handleSubmit() {
       name: 'search',
       query: {
         q: searchQuery.value,
+        p: searchProviderValue.value === 'npm' ? 'npm' : undefined,
       },
     })
   } else {
diff --git a/app/components/SearchProviderToggle.client.vue b/app/components/SearchProviderToggle.client.vue
index bb1dff5d1..deeb89f01 100644
--- a/app/components/SearchProviderToggle.client.vue
+++ b/app/components/SearchProviderToggle.client.vue
@@ -1,5 +1,12 @@
 <script setup lang="ts">
-const { searchProvider, isAlgolia } = useSearchProvider()
+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'
+})
 
 const isOpen = shallowRef(false)
 const toggleRef = useTemplateRef('toggleRef')
@@ -47,21 +54,25 @@ useEventListener('keydown', event => {
             type="button"
             role="menuitem"
             class="w-full flex items-start gap-3 px-3 py-2.5 rounded-md text-start transition-colors hover:bg-bg-muted"
-            :class="[!isAlgolia ? 'bg-bg-muted' : '']"
+            :class="[searchProviderValue !== 'algolia' ? 'bg-bg-muted' : '']"
             @click="
               () => {
                 searchProvider = 'npm'
+                router.push({ query: { ...route.query, p: 'npm' } })
                 isOpen = false
               }
             "
           >
             <span
               class="i-carbon:catalog w-4 h-4 mt-0.5 shrink-0"
-              :class="!isAlgolia ? 'text-accent' : 'text-fg-muted'"
+              :class="searchProviderValue !== 'algolia' ? 'text-accent' : 'text-fg-muted'"
               aria-hidden="true"
             />
             <div class="min-w-0 flex-1">
-              <div class="text-sm font-medium" :class="!isAlgolia ? 'text-fg' : 'text-fg-muted'">
+              <div
+                class="text-sm font-medium"
+                :class="searchProviderValue !== 'algolia' ? 'text-fg' : 'text-fg-muted'"
+              >
                 {{ $t('settings.data_source.npm') }}
               </div>
               <p class="text-xs text-fg-subtle mt-0.5">
@@ -75,21 +86,25 @@ useEventListener('keydown', event => {
             type="button"
             role="menuitem"
             class="w-full flex items-start gap-3 px-3 py-2.5 rounded-md text-start transition-colors hover:bg-bg-muted mt-1"
-            :class="[isAlgolia ? 'bg-bg-muted' : '']"
+            :class="[searchProviderValue === 'algolia' ? 'bg-bg-muted' : '']"
             @click="
               () => {
                 searchProvider = 'algolia'
+                router.push({ query: { ...route.query, p: undefined } })
                 isOpen = false
               }
             "
           >
             <span
               class="i-carbon:search w-4 h-4 mt-0.5 shrink-0"
-              :class="isAlgolia ? 'text-accent' : 'text-fg-muted'"
+              :class="searchProviderValue === 'algolia' ? 'text-accent' : 'text-fg-muted'"
               aria-hidden="true"
             />
             <div class="min-w-0 flex-1">
-              <div class="text-sm font-medium" :class="isAlgolia ? 'text-fg' : 'text-fg-muted'">
+              <div
+                class="text-sm font-medium"
+                :class="searchProviderValue === 'algolia' ? 'text-fg' : 'text-fg-muted'"
+              >
                 {{ $t('settings.data_source.algolia') }}
               </div>
               <p class="text-xs text-fg-subtle mt-0.5">
@@ -99,7 +114,10 @@ useEventListener('keydown', event => {
           </button>
 
           <!-- Algolia attribution -->
-          <div v-if="isAlgolia" class="border-t border-border mx-1 mt-1 pt-2 pb-1">
+          <div
+            v-if="searchProviderValue === 'algolia'"
+            class="border-t border-border mx-1 mt-1 pt-2 pb-1"
+          >
             <a
               href="https://www.algolia.com/developers"
               target="_blank"
diff --git a/app/composables/npm/useOrgPackages.ts b/app/composables/npm/useOrgPackages.ts
index 038d0712a..3e1321d60 100644
--- a/app/composables/npm/useOrgPackages.ts
+++ b/app/composables/npm/useOrgPackages.ts
@@ -10,11 +10,17 @@ import { mapWithConcurrency } from '#shared/utils/async'
  * 3. Falls back to lightweight server-side package-meta lookups
  */
 export function useOrgPackages(orgName: MaybeRefOrGetter<string>) {
+  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 { getPackagesByName } = useAlgoliaSearch()
 
   const asyncData = useLazyAsyncData(
-    () => `org-packages:${searchProvider.value}:${toValue(orgName)}`,
+    () => `org-packages:${searchProviderValue.value}:${toValue(orgName)}`,
     async ({ ssrContext }, { signal }) => {
       const org = toValue(orgName)
       if (!org) {
@@ -51,7 +57,7 @@ export function useOrgPackages(orgName: MaybeRefOrGetter<string>) {
       }
 
       // Fetch metadata + downloads from Algolia (single request via getObjects)
-      if (searchProvider.value === 'algolia') {
+      if (searchProviderValue.value === 'algolia') {
         try {
           const response = await getPackagesByName(packageNames)
           if (response.objects.length > 0) {
diff --git a/app/composables/npm/useSearch.ts b/app/composables/npm/useSearch.ts
index 39f33e65c..302cb159e 100644
--- a/app/composables/npm/useSearch.ts
+++ b/app/composables/npm/useSearch.ts
@@ -4,6 +4,14 @@ import type { AlgoliaMultiSearchChecks } from './useAlgoliaSearch'
 import { type SearchSuggestion, emptySearchResponse, parseSuggestionIntent } from './search-utils'
 import { isValidNewPackageName, checkPackageExists } from '~/utils/package-name'
 
+function emptySearchPayload() {
+  return {
+    searchResponse: emptySearchResponse(),
+    suggestions: [] as SearchSuggestion[],
+    packageAvailability: null as { name: string; available: boolean } | null,
+  }
+}
+
 export interface SearchOptions {
   size?: number
 }
@@ -19,10 +27,10 @@ export interface UseSearchConfig {
 
 export function useSearch(
   query: MaybeRefOrGetter<string>,
+  searchProvider: MaybeRefOrGetter<SearchProvider>,
   options: MaybeRefOrGetter<SearchOptions> = {},
   config: UseSearchConfig = {},
 ) {
-  const { searchProvider } = useSearchProvider()
   const { search: searchAlgolia, searchWithSuggestions: algoliaMultiSearch } = useAlgoliaSearch()
   const {
     search: searchNpm,
@@ -44,7 +52,7 @@ export function useSearch(
   const suggestionsLoading = shallowRef(false)
   const packageAvailability = shallowRef<{ name: string; available: boolean } | null>(null)
   const existenceCache = shallowRef<Record<string, boolean>>({})
-  let suggestionRequestId = 0
+  const suggestionRequestId = shallowRef(0)
 
   /**
    * Determine which extra checks to include in the Algolia multi-search.
@@ -135,14 +143,14 @@ export function useSearch(
   }
 
   const asyncData = useLazyAsyncData(
-    () => `search:${searchProvider.value}:${toValue(query)}`,
+    () => `search:${toValue(searchProvider)}:${toValue(query)}`,
     async (_nuxtApp, { signal }) => {
       const q = toValue(query)
-      const provider = searchProvider.value
+      const provider = toValue(searchProvider)
 
       if (!q.trim()) {
         isRateLimited.value = false
-        return emptySearchResponse()
+        return emptySearchPayload()
       }
 
       const opts = toValue(options)
@@ -156,29 +164,37 @@ export function useSearch(
           const result = await algoliaMultiSearch(q, { size: opts.size ?? 25 }, checks)
 
           if (q !== toValue(query)) {
-            return emptySearchResponse()
+            return emptySearchPayload()
           }
 
           isRateLimited.value = false
           processAlgoliaChecks(q, checks, result)
-          return result.search
+          return {
+            searchResponse: result.search,
+            suggestions: suggestions.value,
+            packageAvailability: packageAvailability.value,
+          }
         }
 
         const response = await searchAlgolia(q, { size: opts.size ?? 25 })
 
         if (q !== toValue(query)) {
-          return emptySearchResponse()
+          return emptySearchPayload()
         }
 
         isRateLimited.value = false
-        return response
+        return {
+          searchResponse: response,
+          suggestions: [],
+          packageAvailability: null,
+        }
       }
 
       try {
         const response = await searchNpm(q, { size: opts.size ?? 25 }, signal)
 
         if (q !== toValue(query)) {
-          return emptySearchResponse()
+          return emptySearchPayload()
         }
 
         cache.value = {
@@ -189,7 +205,11 @@ export function useSearch(
         }
 
         isRateLimited.value = false
-        return response
+        return {
+          searchResponse: response,
+          suggestions: [],
+          packageAvailability: null,
+        }
       } catch (error: unknown) {
         const errorMessage = (error as { message?: string })?.message || String(error)
         const isRateLimitError =
@@ -197,17 +217,17 @@ export function useSearch(
 
         if (isRateLimitError) {
           isRateLimited.value = true
-          return emptySearchResponse()
+          return emptySearchPayload()
         }
         throw error
       }
     },
-    { default: emptySearchResponse },
+    { default: emptySearchPayload },
   )
 
   async function fetchMore(targetSize: number): Promise<void> {
     const q = toValue(query).trim()
-    const provider = searchProvider.value
+    const provider = toValue(searchProvider)
 
     if (!q) {
       cache.value = null
@@ -222,12 +242,12 @@ export function useSearch(
 
     // Seed cache from asyncData for Algolia (which skips cache on initial fetch)
     if (!cache.value && asyncData.data.value) {
-      const d = asyncData.data.value
+      const { searchResponse } = asyncData.data.value
       cache.value = {
         query: q,
         provider,
-        objects: [...d.objects],
-        total: d.total,
+        objects: [...searchResponse.objects],
+        total: searchResponse.total,
       }
     }
 
@@ -287,15 +307,18 @@ export function useSearch(
     },
   )
 
-  watch(searchProvider, async () => {
-    cache.value = null
-    existenceCache.value = {}
-    await asyncData.refresh()
-    const targetSize = toValue(options).size
-    if (targetSize) {
-      await fetchMore(targetSize)
-    }
-  })
+  watch(
+    () => toValue(searchProvider),
+    async () => {
+      cache.value = null
+      existenceCache.value = {}
+      await asyncData.refresh()
+      const targetSize = toValue(options).size
+      if (targetSize) {
+        await fetchMore(targetSize)
+      }
+    },
+  )
 
   const data = computed<NpmSearchResponse | null>(() => {
     if (cache.value) {
@@ -306,121 +329,146 @@ export function useSearch(
         time: new Date().toISOString(),
       }
     }
-    return asyncData.data.value
+    return asyncData.data.value?.searchResponse ?? null
   })
 
-  if (import.meta.client && asyncData.data.value?.isStale) {
-    onMounted(() => {
-      asyncData.refresh()
-    })
-  }
-
   const hasMore = computed(() => {
     if (!cache.value) return true
     return cache.value.objects.length < cache.value.total
   })
 
-  // npm suggestion checking (Algolia handles suggestions inside the search handler above)
-  if (config.suggestions) {
-    async function validateSuggestionsNpm(q: string) {
-      const requestId = ++suggestionRequestId
-      const { intent, name } = parseSuggestionIntent(q)
+  async function validateSuggestionsNpm(q: string) {
+    const requestId = ++suggestionRequestId.value
+    const { intent, name } = parseSuggestionIntent(q)
+    let availability: { name: string; available: boolean } | null = null
 
-      const trimmed = q.trim()
-      if (isValidNewPackageName(trimmed)) {
+    const promises: Promise<void>[] = []
+
+    const trimmed = q.trim()
+    if (isValidNewPackageName(trimmed)) {
+      promises.push(
         checkPackageExists(trimmed)
           .then(exists => {
             if (trimmed === toValue(query).trim()) {
-              packageAvailability.value = { name: trimmed, available: !exists }
+              availability = { name: trimmed, available: !exists }
+              packageAvailability.value = availability
             }
           })
           .catch(() => {
-            packageAvailability.value = null
-          })
-      } else {
-        packageAvailability.value = null
-      }
+            availability = null
+          }),
+      )
+    } else {
+      availability = null
+    }
 
-      if (!intent || !name) {
-        suggestions.value = []
-        suggestionsLoading.value = false
-        return
-      }
+    if (!intent || !name) {
+      suggestionsLoading.value = false
+      await Promise.all(promises)
+      return { suggestions: [], packageAvailability: availability }
+    }
 
-      suggestionsLoading.value = true
-      const result: SearchSuggestion[] = []
-      const lowerName = name.toLowerCase()
+    suggestionsLoading.value = true
+    const result: SearchSuggestion[] = []
+    const lowerName = name.toLowerCase()
 
-      try {
-        const wantOrg = intent === 'org' || intent === 'both'
-        const wantUser = intent === 'user' || intent === 'both'
-
-        const promises: Promise<void>[] = []
-
-        if (wantOrg && existenceCache.value[`org:${lowerName}`] === undefined) {
-          promises.push(
-            checkOrgNpm(name)
-              .then(exists => {
-                existenceCache.value = { ...existenceCache.value, [`org:${lowerName}`]: exists }
-              })
-              .catch(() => {
-                existenceCache.value = { ...existenceCache.value, [`org:${lowerName}`]: false }
-              }),
-          )
-        }
+    try {
+      const wantOrg = intent === 'org' || intent === 'both'
+      const wantUser = intent === 'user' || intent === 'both'
 
-        if (wantUser && existenceCache.value[`user:${lowerName}`] === undefined) {
-          promises.push(
-            checkUserNpm(name)
-              .then(exists => {
-                existenceCache.value = { ...existenceCache.value, [`user:${lowerName}`]: exists }
-              })
-              .catch(() => {
-                existenceCache.value = { ...existenceCache.value, [`user:${lowerName}`]: false }
-              }),
-          )
-        }
+      if (wantOrg && existenceCache.value[`org:${lowerName}`] === undefined) {
+        promises.push(
+          checkOrgNpm(name)
+            .then(exists => {
+              existenceCache.value = { ...existenceCache.value, [`org:${lowerName}`]: exists }
+            })
+            .catch(() => {
+              existenceCache.value = { ...existenceCache.value, [`org:${lowerName}`]: false }
+            }),
+        )
+      }
 
-        if (promises.length > 0) {
-          await Promise.all(promises)
-        }
+      if (wantUser && existenceCache.value[`user:${lowerName}`] === undefined) {
+        promises.push(
+          checkUserNpm(name)
+            .then(exists => {
+              existenceCache.value = { ...existenceCache.value, [`user:${lowerName}`]: exists }
+            })
+            .catch(() => {
+              existenceCache.value = { ...existenceCache.value, [`user:${lowerName}`]: false }
+            }),
+        )
+      }
 
-        if (requestId !== suggestionRequestId) return
+      if (promises.length > 0) {
+        await Promise.all(promises)
+      }
 
-        const isOrg = wantOrg && existenceCache.value[`org:${lowerName}`]
-        const isUser = wantUser && existenceCache.value[`user:${lowerName}`]
+      if (requestId !== suggestionRequestId.value)
+        return { suggestions: [], packageAvailability: availability }
 
-        if (isOrg) {
-          result.push({ type: 'org', name, exists: true })
-        }
-        if (isUser && !isOrg) {
-          result.push({ type: 'user', name, exists: true })
-        }
-      } finally {
-        if (requestId === suggestionRequestId) {
-          suggestionsLoading.value = false
-        }
-      }
+      const isOrg = wantOrg && existenceCache.value[`org:${lowerName}`]
+      const isUser = wantUser && existenceCache.value[`user:${lowerName}`]
 
-      if (requestId === suggestionRequestId) {
-        suggestions.value = result
+      if (isOrg) {
+        result.push({ type: 'org', name, exists: true })
+      }
+      if (isUser && !isOrg) {
+        result.push({ type: 'user', name, exists: true })
+      }
+    } finally {
+      if (requestId === suggestionRequestId.value) {
+        suggestionsLoading.value = false
       }
     }
 
-    watch(
-      () => toValue(query),
-      q => {
-        if (searchProvider.value !== 'algolia') {
-          validateSuggestionsNpm(q)
-        }
-      },
-      { immediate: true },
-    )
+    if (requestId === suggestionRequestId.value) {
+      suggestions.value = result
+      return { suggestions: result, packageAvailability: availability }
+    }
+
+    return { suggestions: [], packageAvailability: availability }
+  }
+
+  const npmSuggestions = useLazyAsyncData(
+    () => `npm-suggestions:${toValue(searchProvider)}:${toValue(query)}`,
+    async () => {
+      const q = toValue(query).trim()
+      if (toValue(searchProvider) === 'algolia' || !q)
+        return { suggestions: [], packageAvailability: null }
+      const { intent, name } = parseSuggestionIntent(q)
+      if (!intent || !name) return { suggestions: [], packageAvailability: null }
+      return validateSuggestionsNpm(q)
+    },
+    { default: () => ({ suggestions: [], packageAvailability: null }) },
+  )
 
-    watch(searchProvider, () => {
-      if (searchProvider.value !== 'algolia') {
-        validateSuggestionsNpm(toValue(query))
+  watch(
+    [() => asyncData.data.value.suggestions, () => npmSuggestions.data.value.suggestions],
+    ([algoliaSuggestions, npmSuggestionsValue]) => {
+      if (algoliaSuggestions.length || npmSuggestionsValue.length) {
+        suggestions.value = algoliaSuggestions.length ? algoliaSuggestions : npmSuggestionsValue
       }
+    },
+    { immediate: true },
+  )
+
+  watch(
+    [
+      () => asyncData.data.value?.packageAvailability,
+      () => npmSuggestions.data.value.packageAvailability,
+    ],
+    ([algoliaPackageAvailability, npmPackageAvailability]) => {
+      if (algoliaPackageAvailability || npmPackageAvailability) {
+        packageAvailability.value = algoliaPackageAvailability || npmPackageAvailability
+      }
+    },
+    { immediate: true },
+  )
+
+  if (import.meta.client && asyncData.data.value?.searchResponse.isStale) {
+    onMounted(() => {
+      asyncData.refresh()
     })
   }
 
diff --git a/app/composables/npm/useUserPackages.ts b/app/composables/npm/useUserPackages.ts
index c42f53064..dc9ab0ffa 100644
--- a/app/composables/npm/useUserPackages.ts
+++ b/app/composables/npm/useUserPackages.ts
@@ -22,7 +22,13 @@ const MAX_RESULTS = 250
  * ```
  */
 export function useUserPackages(username: MaybeRefOrGetter<string>) {
+  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'
+  })
   // this is only used in npm path, but we need to extract it when the composable runs
   const { $npmRegistry } = useNuxtApp()
   const { searchByOwner } = useAlgoliaSearch()
@@ -32,7 +38,7 @@ export function useUserPackages(username: MaybeRefOrGetter<string>) {
 
   /** Tracks which provider actually served the current data (may differ from
    *  searchProvider when Algolia returns empty and we fall through to npm) */
-  const activeProvider = shallowRef<'npm' | 'algolia'>(searchProvider.value)
+  const activeProvider = shallowRef<'npm' | 'algolia'>(searchProviderValue.value)
 
   const cache = shallowRef<{
     username: string
@@ -43,14 +49,14 @@ export function useUserPackages(username: MaybeRefOrGetter<string>) {
   const isLoadingMore = shallowRef(false)
 
   const asyncData = useLazyAsyncData(
-    () => `user-packages:${searchProvider.value}:${toValue(username)}`,
+    () => `user-packages:${searchProviderValue.value}:${toValue(username)}`,
     async ({ $npmRegistry }, { signal }) => {
       const user = toValue(username)
       if (!user) {
         return emptySearchResponse()
       }
 
-      const provider = searchProvider.value
+      const provider = searchProviderValue.value
 
       // --- Algolia: fetch all at once ---
       if (provider === 'algolia') {
@@ -58,7 +64,7 @@ export function useUserPackages(username: MaybeRefOrGetter<string>) {
           const response = await searchByOwner(user)
 
           // Guard against stale response (user/provider changed during await)
-          if (user !== toValue(username) || provider !== searchProvider.value) {
+          if (user !== toValue(username) || provider !== searchProviderValue.value) {
             return emptySearchResponse()
           }
 
@@ -95,7 +101,7 @@ export function useUserPackages(username: MaybeRefOrGetter<string>) {
       )
 
       // Guard against stale response (user/provider changed during await)
-      if (user !== toValue(username) || provider !== searchProvider.value) {
+      if (user !== toValue(username) || provider !== searchProviderValue.value) {
         return emptySearchResponse()
       }
 
@@ -193,11 +199,14 @@ export function useUserPackages(username: MaybeRefOrGetter<string>) {
 
   // asyncdata will automatically rerun due to key, but we need to reset cache/page
   // when provider changes
-  watch(searchProvider, newProvider => {
-    cache.value = null
-    currentPage.value = 1
-    activeProvider.value = newProvider
-  })
+  watch(
+    () => searchProviderValue.value,
+    newProvider => {
+      cache.value = null
+      currentPage.value = 1
+      activeProvider.value = newProvider
+    },
+  )
 
   // Computed data that uses cache (only if it belongs to the current username)
   const data = computed<NpmSearchResponse | null>(() => {
diff --git a/app/pages/index.vue b/app/pages/index.vue
index 9053fd1d3..897888a27 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -2,7 +2,7 @@
 import { debounce } from 'perfect-debounce'
 import { SHOWCASED_FRAMEWORKS } from '~/utils/frameworks'
 
-const { isAlgolia } = useSearchProvider()
+const { searchProvider } = useSearchProvider()
 
 const searchQuery = shallowRef('')
 const isSearchFocused = shallowRef(false)
@@ -12,7 +12,7 @@ async function search() {
   if (!query) return
   await navigateTo({
     path: '/search',
-    query: query ? { q: query } : undefined,
+    query: query ? { q: query, p: searchProvider.value === 'npm' ? 'npm' : undefined } : undefined,
   })
   const newQuery = searchQuery.value.trim()
   if (newQuery !== query) {
@@ -26,7 +26,7 @@ const handleInputAlgolia = debounce(search, 80, { leading: true, trailing: true
 function handleInput() {
   if (isTouchDevice()) {
     search()
-  } else if (isAlgolia.value) {
+  } else if (searchProvider.value === 'algolia') {
     handleInputAlgolia()
   } else {
     handleInputNpm()
diff --git a/app/pages/search.vue b/app/pages/search.vue
index 49d44c7b3..ca4c63f92 100644
--- a/app/pages/search.vue
+++ b/app/pages/search.vue
@@ -10,8 +10,12 @@ import { normalizeSearchParam } from '#shared/utils/url'
 const route = useRoute()
 const router = useRouter()
 
-// Search provider
-const { isAlgolia } = useSearchProvider()
+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 {
@@ -29,6 +33,7 @@ const updateUrlPage = debounce((page: number) => {
     query: {
       ...route.query,
       page: page > 1 ? page : undefined,
+      p: searchProviderValue.value === 'npm' ? 'npm' : undefined,
     },
   })
 }, 500)
@@ -126,7 +131,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[isAlgolia.value ? 'algolia' : 'npm']
+  const supported = PROVIDER_SORT_KEYS[searchProviderValue.value]
   return ALL_SORT_KEYS.filter(k => !supported.has(k))
 })
 
@@ -168,16 +173,16 @@ 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 = isAlgolia.value ? EAGER_LOAD_SIZE.algolia : EAGER_LOAD_SIZE.npm
+    const cap = EAGER_LOAD_SIZE[searchProviderValue.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(isAlgolia, algolia => {
+watch(searchProviderValue, provider => {
   const { key } = parseSortOption(sortOption.value)
-  const supported = PROVIDER_SORT_KEYS[algolia ? 'algolia' : 'npm']
+  const supported = PROVIDER_SORT_KEYS[provider]
   if (!supported.has(key)) {
     sortOption.value = 'relevance-desc'
   }
@@ -195,6 +200,7 @@ const {
   packageAvailability,
 } = useSearch(
   query,
+  searchProviderValue,
   () => ({
     size: requestedSize.value,
   }),
diff --git a/test/e2e/interactions.spec.ts b/test/e2e/interactions.spec.ts
index f40403267..b900bbafa 100644
--- a/test/e2e/interactions.spec.ts
+++ b/test/e2e/interactions.spec.ts
@@ -68,9 +68,9 @@ test.describe('Search Pages', () => {
     await page.keyboard.press('ArrowUp')
 
     // Enter navigates to the selected result
-    // URL is /package/vue not /vue
+    // URL is /package/vue or /org/vue or /user/vue. Not /vue
     await page.keyboard.press('Enter')
-    await expect(page).toHaveURL(/\/package\/vue/)
+    await expect(page).toHaveURL(/\/(package|org|user)\/vue/)
   })
 
   test('/search?q=vue → "/" focuses the search input from results', async ({ page, goto }) => {