diff --git a/.vuepress/client.js b/.vuepress/client.js
index 30391c6b5d8..6c9e56bf648 100755
--- a/.vuepress/client.js
+++ b/.vuepress/client.js
@@ -10,6 +10,7 @@ import BlogPosts from './components/BlogPosts.vue';
 import JumpToc from './components/JumpToc.vue';
 import PrBy from './components/PrBy.vue';
 import ReleaseToc from './components/ReleaseToc.vue';
+import URLDocSearch from './components/URLDocSearch.vue';
 
 export default defineClientConfig({
   enhance({ app }) {
@@ -18,5 +19,8 @@ export default defineClientConfig({
     app.component('JumpToc', JumpToc);
     app.component('PrBy', PrBy);
     app.component('ReleaseToc', ReleaseToc);
+
+    // Override the builtin searchbox
+    app.component('SearchBox', URLDocSearch);
   },
 });
diff --git a/.vuepress/components/URLDocSearch.vue b/.vuepress/components/URLDocSearch.vue
new file mode 100644
index 00000000000..20cd3790266
--- /dev/null
+++ b/.vuepress/components/URLDocSearch.vue
@@ -0,0 +1,46 @@
+<template>
+  <DocSearch :options="docsearchOptions" />
+</template>
+
+<script setup lang="ts">
+import { DocSearch, DocSearchOptions } from '@vuepress/plugin-docsearch/client';
+import { useDebounceFn, useEventListener } from '@vueuse/core';
+import { onMounted, Ref, ref } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+
+const SEARCH_KEY = 'search';
+const docsearchOptions: Ref<DocSearchOptions> = ref({});
+const router = useRouter();
+const route = useRoute();
+
+// Handle initial search query, if one is set
+onMounted(() => {
+  const query = new URL(window.location.href).searchParams.get(SEARCH_KEY);
+  if (query) {
+    docsearchOptions.value.initialQuery = query;
+    (document.querySelector('.DocSearch-Button') as HTMLButtonElement).click();
+  }
+});
+
+// There's some debounce builtin to docsearch, this mimics that and should
+// help prevent browser history from getting filled with partial queries.
+const inputHandler = useDebounceFn(handleSearchInput, 500);
+useEventListener('input', (event) => inputHandler(event as InputEvent));
+
+// Update the URL bar when the search input changes.
+function handleSearchInput(event: InputEvent) {
+  const target = event.target as HTMLInputElement | undefined;
+  const searchQuery = target?.value;
+  if (target?.id !== 'docsearch-input' || !searchQuery) {
+    return;
+  }
+
+  // If we had already started a search, replace it instead of appending
+  const { path, query: routeQuery } = route;
+  const replace = routeQuery?.hasOwnProperty(SEARCH_KEY);
+  const query = { ...routeQuery }; // NOTE: must copy the query object
+  query[SEARCH_KEY] = searchQuery;
+
+  router.push({ path, query: { ...query }, replace });
+}
+</script>
diff --git a/.vuepress/config.js b/.vuepress/config.js
index b7dec6d00b1..bb256454d1c 100755
--- a/.vuepress/config.js
+++ b/.vuepress/config.js
@@ -110,6 +110,15 @@ export default defineUserConfig({
       { name: 'apple-mobile-web-app-status-bar-style', content: 'black' },
     ],
     ['link', { rel: 'icon', href: '/icon.png' }],
+    [
+      'link',
+      {
+        rel: 'search',
+        type: 'application/opensearchdescription+xml',
+        title: 'Nushell Docs', // NOTE: must match ShortName
+        href: '/opensearch.xml',
+      },
+    ],
   ],
   markdown: {
     importCode: {
diff --git a/.vuepress/public/opensearch.xml b/.vuepress/public/opensearch.xml
new file mode 100644
index 00000000000..25ea0573de1
--- /dev/null
+++ b/.vuepress/public/opensearch.xml
@@ -0,0 +1,12 @@
+<OpenSearchDescription
+  xmlns="http://a9.com/-/spec/opensearch/1.1/"
+  xmlns:moz="http://www.mozilla.org/2006/browser/search/"
+>
+  <ShortName>Nushell Docs</ShortName>
+  <Description>Search Nushell documentation</Description>
+  <InputEncoding>UTF-8</InputEncoding>
+  <Image width="16" height="16" type="image/png">https://www.nushell.sh/icon.png</Image>
+  <Url type="text/html" template="https://www.nushell.sh/?search={searchTerms}" />
+  <Url type="application/opensearchdescription+xml" rel="self" template="https://www.nushell.sh/opensearch.xml" />
+  <!-- TODO: it might be possible to provide suggestions via some Algolia API? -->
+</OpenSearchDescription>