diff --git a/@theme/components/Navbar/AlgoliaSearch.tsx b/@theme/components/Navbar/AlgoliaSearch.tsx
deleted file mode 100644
index 26d7e98bb9..0000000000
--- a/@theme/components/Navbar/AlgoliaSearch.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { DocSearch } from '@docsearch/react';
-import { useThemeHooks } from '@redocly/theme/core/hooks';
-
-export function AlgoliaSearch() {
-    const { useL10n } = useThemeHooks()
-    let { lang } = useL10n()
-    return (
-            <DocSearch
-                appId="R39QY3MZC7"
-                indexName="xrpl"
-                apiKey="3431349deec23b0bc3dcd3424beb9a6e"
-                searchParameters={{
-                    facetFilters: ['lang:'+lang],
-                }}
-            />
-    )
-}
diff --git a/@theme/components/Navbar/Navbar.tsx b/@theme/components/Navbar/Navbar.tsx
index 16e6557c2f..042e6c55d2 100644
--- a/@theme/components/Navbar/Navbar.tsx
+++ b/@theme/components/Navbar/Navbar.tsx
@@ -4,7 +4,7 @@ import { LanguagePicker } from "@redocly/theme/components/LanguagePicker/Languag
 import { slugify } from "../../helpers";
 import { Link } from "@redocly/theme/components/Link/Link";
 import { ColorModeSwitcher } from "@redocly/theme/components/ColorModeSwitcher/ColorModeSwitcher";
-import { AlgoliaSearch } from "./AlgoliaSearch";
+import { Search } from "@redocly/theme/components/Search/Search";
 import arrowUpRight from "../../../static/img/icons/arrow-up-right-custom.svg";
 
 // @ts-ignore
@@ -139,7 +139,7 @@ export function Navbar(props) {
           <NavItems>
             {navItems}
             <div id="topnav-search" className="nav-item search">
-              <AlgoliaSearch />
+              <Search className="topnav-search"/>
             </div>
             <div id="topnav-language" className="nav-item">
               <LanguagePicker
diff --git a/package.json b/package.json
index ea19ee4c94..b8d53a15ab 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
   "dependencies": {
     "@codemirror/state": "6.5.2",
     "@codemirror/view": "^6.22.2",
-    "@docsearch/react": "^3.8.0",
     "@lezer/highlight": "^1.2.0",
     "@redocly/realm": "0.120.2",
     "@uiw/codemirror-themes": "4.21.21",
diff --git a/styles/_top-nav.scss b/styles/_top-nav.scss
index bb04ab963d..a38556d22d 100644
--- a/styles/_top-nav.scss
+++ b/styles/_top-nav.scss
@@ -144,6 +144,7 @@ $banner-height: 52px; // Apex 2025 banner is 52px. 0 for no pencil banner.
   }
 
   #topnav-search {
+    flex-grow: 1;
     .input-group {
       flex-grow: 1;
       flex-wrap: nowrap; // Fix search bar splitting into two lines on iPhone 5
@@ -315,7 +316,7 @@ $banner-height: 52px; // Apex 2025 banner is 52px. 0 for no pencil banner.
 
     @include media-breakpoint-up(xl) {
       #topnav-search {
-        margin-left: auto;
+        margin-left: 3.5rem;
         margin-right: 0.5rem;
       }
       #topnav-language {
diff --git a/styles/light/_light-theme.scss b/styles/light/_light-theme.scss
index c762c624ad..32142def5f 100644
--- a/styles/light/_light-theme.scss
+++ b/styles/light/_light-theme.scss
@@ -1340,7 +1340,7 @@ main article .card-grid {
   }
 }
 
-/* Search styles */
+/* Algolia Search styles
 
 .algolia-autocomplete .ds-dropdown-menu::before {
   background-color: $gray-100;
@@ -1352,3 +1352,4 @@ main article .card-grid {
 .DocSearch-Modal {
   box-shadow: $light-box-shadow;  
 }
+ */
\ No newline at end of file