diff --git a/apps/marketing-astro/src/pages/docs/[...path].astro b/apps/marketing-astro/src/pages/docs/[...path].astro
index 288577a0..237ea900 100644
--- a/apps/marketing-astro/src/pages/docs/[...path].astro
+++ b/apps/marketing-astro/src/pages/docs/[...path].astro
@@ -83,9 +83,10 @@ const sections = await getFiles();
 
           <!-- DESKTOP NAVIGATION -->
 
-
-
-          <nav class="text-base md:text-sm h-[calc(100vh-4.5rem)] overflow-x-hidden -ml-0.5 py-16 pl-0.5 scrollbar-thin">
+          <nav
+            class="text-base md:text-sm h-[calc(100vh-4.5rem)] overflow-x-hidden -ml-0.5 py-16 pl-0.5 scrollbar-thin"
+            id="docs-sidebar-nav"
+          >
             <ul role="list" class="space-y-9">
               {
                 sections.map((section) => (
@@ -223,3 +224,22 @@ const sections = await getFiles();
     </div>
   </div>
 </Root>
+
+<script>
+  document.addEventListener("astro:before-swap", () => {
+    sessionStorage.setItem(
+      "docs-sidebar-nav-scroll",
+      document.getElementById("docs-sidebar-nav")!.scrollTop.toString()
+    );
+  });
+
+  document.addEventListener("astro:after-swap", () => {
+    const scroll = sessionStorage.getItem("docs-sidebar-nav-scroll");
+    if (scroll) {
+      document.getElementById("docs-sidebar-nav")!.scrollTo({
+        top: parseInt(scroll),
+        behavior: "instant",
+      });
+    }
+  });
+</script>
diff --git a/apps/marketing-astro/src/pages/docs/nextPage.tsx b/apps/marketing-astro/src/pages/docs/nextPage.tsx
index 19aace11..5fc6c87b 100644
--- a/apps/marketing-astro/src/pages/docs/nextPage.tsx
+++ b/apps/marketing-astro/src/pages/docs/nextPage.tsx
@@ -1,5 +1,4 @@
 import { Link } from "@pixeleye/ui/src/link";
-import { getFiles } from "./utils";
 import { ArrowLeftIcon, ArrowRightIcon } from "@heroicons/react/24/outline";
 
 
@@ -40,7 +39,7 @@ function PageLink({
 
 
 
-export async function PageNavigation(
+export function PageNavigation(
     {
         currentPageURL
     }: {
@@ -49,7 +48,12 @@ export async function PageNavigation(
     }
 ) {
 
-    const sections = (await getFiles()).flatMap((group) => group.links)
+    // const sections = (await getFiles()).flatMap((group) => group.links)
+
+    const sections: {
+        title: string;
+        href: string;
+    }[] = []
 
     let currentPageIndex = sections.findIndex((page) => page.href === currentPageURL)