diff --git a/docs/_docset.yml b/docs/_docset.yml
index 80230bceb..c2b01a95c 100644
--- a/docs/_docset.yml
+++ b/docs/_docset.yml
@@ -19,7 +19,7 @@ subs:
   dbuild: "docs-builder"
 
 features:
-  primary-nav: false
+  primary-nav: true
 
 api:
    elasticsearch: elasticsearch-openapi.json
diff --git a/src/Elastic.Documentation.Site/Assets/styles.css b/src/Elastic.Documentation.Site/Assets/styles.css
index 4f8d3b6ac..6e5def0b0 100644
--- a/src/Elastic.Documentation.Site/Assets/styles.css
+++ b/src/Elastic.Documentation.Site/Assets/styles.css
@@ -119,8 +119,8 @@ body {
 
 	.sidebar {
 		.sidebar-nav {
-			@apply sticky top-(--offset-top) z-30 overflow-y-auto;
-			max-height: calc(100vh - var(--offset-top));
+			@apply sticky top-0 z-30 overflow-y-auto;
+			max-height: 100vh;
 			scrollbar-gutter: stable;
 			scroll-behavior: smooth;
 		}
diff --git a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearch.tsx b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearch.tsx
index 03617f0cc..c1712b365 100644
--- a/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearch.tsx
+++ b/src/Elastic.Documentation.Site/Assets/web-components/NavigationSearch/NavigationSearch.tsx
@@ -80,7 +80,7 @@ export const NavigationSearch = () => {
     return (
         <div
             css={css`
-                padding-top: ${euiTheme.size.base};
+                padding-top: ${euiTheme.size.l};
                 padding-right: ${euiTheme.size.base};
             `}
         >
diff --git a/src/Elastic.Documentation.Site/Layout/_Header.cshtml b/src/Elastic.Documentation.Site/Layout/_Header.cshtml
index fd8d29215..19343fe19 100644
--- a/src/Elastic.Documentation.Site/Layout/_Header.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_Header.cshtml
@@ -5,8 +5,8 @@
 		<div id="elastic-nav" hx-disable="true"></div>
 		@{
 			var elasticNavUrl = Model.Features.StagingElasticNavEnabled 
-				? "https://stag-www.elastic.co/elastic-nav.js" 
-				: "https://www.elastic.co/elastic-nav.js";
+				? "https://dev-naas-remove-sticky.app.elstc.co/elastic-nav.js"
+				: "https://dev-naas-remove-sticky.app.elstc.co/elastic-nav.js";
 		}
 		<script src="@elasticNavUrl" async></script>
 	</div>
diff --git a/src/Elastic.Documentation.Site/Layout/_PagesNav.cshtml b/src/Elastic.Documentation.Site/Layout/_PagesNav.cshtml
index 78b725278..0a485acad 100644
--- a/src/Elastic.Documentation.Site/Layout/_PagesNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_PagesNav.cshtml
@@ -1,5 +1,5 @@
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
-<aside class="sidebar font-sans bg-white fixed md:sticky shadow-2xl md:shadow-none left-[100%] group-has-[#pages-nav-hamburger:checked]/body:left-0 bottom-0 md:left-auto pl-6 md:pl-2 top-[calc(var(--offset-top)+1px)] w-[80%] md:w-auto shrink-0 border-r-1 border-r-grey-20 z-40 md:z-auto">
+<aside class="sidebar font-sans bg-white fixed md:sticky shadow-2xl md:shadow-none left-[100%] group-has-[#pages-nav-hamburger:checked]/body:left-0 bottom-0 md:left-auto pl-6 md:pl-2 top-0 w-[80%] md:w-auto shrink-0 border-r-1 border-r-grey-20 z-40 md:z-auto">
 	
 	@if (Model.Features.LazyLoadNavigation && !string.IsNullOrEmpty(Model.NavigationFileName))
 	{