diff --git a/src/App.tsx b/src/App.tsx
index f1947972..7898f83f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -126,6 +126,11 @@ function AppShell() {
     };
   }, [isLoggedIn, activeServerId, setMusicFolders]);
 
+  // Reset scroll position on route change
+  useEffect(() => {
+    document.querySelector('.content-body')?.scrollTo({ top: 0 });
+  }, [location.pathname]);
+
   // Auto-navigate to offline library when no connection but cached content exists
   const prevConnStatus = useRef(connStatus);
   useEffect(() => {