diff --git a/app/layout.tsx b/app/layout.tsx
index f89c1707..c0b8b600 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -8,6 +8,7 @@ import { PopUpProvider } from "components/Toast";
 import { IdentityProviderServer } from "components/IdentityProviderServer";
 import { headers } from "next/headers";
 import { IPLocationProvider } from "components/Providers/IPLocationProvider";
+import { RouteUIStateManager } from "components/RouteUIStateManger";
 
 export const metadata = {
   title: "Leaflet",
@@ -48,7 +49,7 @@ export default function RootLayout({
 }) {
   let ipLocation = headers().get("X-Vercel-IP-Country");
   return (
-    <html lang="en" className={`${quattro.variable}`}>
+    <html suppressHydrationWarning lang="en" className={`${quattro.variable}`}>
       <body>
         <script
           dangerouslySetInnerHTML={{
@@ -70,6 +71,7 @@ export default function RootLayout({
             <IdentityProviderServer>
               <IPLocationProvider country={ipLocation}>
                 <ViewportSizeLayout>{children}</ViewportSizeLayout>
+                <RouteUIStateManager />
               </IPLocationProvider>
             </IdentityProviderServer>
           </PopUpProvider>
diff --git a/components/RouteUIStateManger.tsx b/components/RouteUIStateManger.tsx
new file mode 100644
index 00000000..b416158a
--- /dev/null
+++ b/components/RouteUIStateManger.tsx
@@ -0,0 +1,30 @@
+"use client";
+import { useUIState } from "src/useUIState";
+import { useEffect } from "react";
+import { usePathname } from "next/navigation";
+
+const routeOpenPages = new Map<string, string[]>();
+let previousPathname = null as null | string;
+export const RouteUIStateManager = () => {
+  const pathname = usePathname();
+  useEffect(() => {
+    routeOpenPages.set(
+      previousPathname || pathname,
+      useUIState.getState().openPages,
+    );
+    previousPathname = pathname;
+
+    // Restore open pages for new route if we have them
+    const savedOpenPages = routeOpenPages.get(pathname) || [];
+
+    useUIState.setState({
+      focusedEntity: null,
+      selectedBlocks: [],
+      foldedBlocks: [],
+      openPages: savedOpenPages,
+      lastUsedHighlight: "1",
+    });
+  }, [pathname]);
+
+  return null;
+};