diff --git a/frontend/src/routes/root.tsx b/frontend/src/routes/root.tsx
index be89f40..d64d530 100644
--- a/frontend/src/routes/root.tsx
+++ b/frontend/src/routes/root.tsx
@@ -1,7 +1,10 @@
 import { lazy, Suspense } from "react";
 import { QueryClient } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-import { createRootRouteWithContext } from "@tanstack/react-router";
+import {
+  createRootRouteWithContext,
+  ScrollRestoration,
+} from "@tanstack/react-router";
 
 import { Layout } from "~/components/Layout";
 
@@ -24,6 +27,8 @@ export const rootRoute = rootRouteWithContext({
     <>
       <Layout />
 
+      <ScrollRestoration getKey={(location) => location.pathname} />
+
       <Suspense>
         <TanStackRouterDevtools position="bottom-right" />
       </Suspense>