From 854005e16dff01fbb66c6a18651ef98d7ac54c9f Mon Sep 17 00:00:00 2001
From: Brendan O'Leary <brendan@olearycrew.com>
Date: Sat, 21 Feb 2026 06:55:33 -0500
Subject: [PATCH] Fix navigation issue with sidenav

---
 packages/kilo-docs/pages/_app.tsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/kilo-docs/pages/_app.tsx b/packages/kilo-docs/pages/_app.tsx
index 933d48d5f..e8ad6f7fb 100644
--- a/packages/kilo-docs/pages/_app.tsx
+++ b/packages/kilo-docs/pages/_app.tsx
@@ -73,7 +73,7 @@ export default function MyApp({ Component, pageProps }: AppProps<MyAppProps>) {
     posthog.capture("$pageview")
   }, [])
 
-  // Close mobile menu on route change and track pageviews
+  // Close mobile menu on route change, track pageviews, and reset scroll position
   useEffect(() => {
     const handleRouteChange = () => {
       setIsMobileMenuOpen(false)
@@ -81,6 +81,11 @@ export default function MyApp({ Component, pageProps }: AppProps<MyAppProps>) {
 
     const handleRouteComplete = () => {
       posthog.capture("$pageview")
+      // Reset scroll position of the main content container on navigation
+      const mainContent = document.querySelector(".main-content")
+      if (mainContent) {
+        mainContent.scrollTop = 0
+      }
     }
 
     router.events.on("routeChangeStart", handleRouteChange)
@@ -175,7 +180,7 @@ export default function MyApp({ Component, pageProps }: AppProps<MyAppProps>) {
               <div className="article-content flex column mt-5">
                 <Component {...pageProps} />
               </div>
-              <div className="right-sidebar">
+              <div className="right-sidebar" key={router.asPath}>
                 {markdoc && <CopyPageButton />}
                 <TableOfContents toc={toc} />
               </div>