diff --git a/deno.lock b/deno.lock
index 7e988e49..0300c35a 100644
--- a/deno.lock
+++ b/deno.lock
@@ -27,6 +27,7 @@
     "npm:@radix-ui/react-toggle-group@^1.1.9": "1.1.10_@types+react@19.1.2_@types+react-dom@19.1.3__@types+react@19.1.2_react@19.1.0_react-dom@19.1.0__react@19.1.0",
     "npm:@radix-ui/react-tooltip@^1.2.4": "1.2.4_@types+react@19.1.2_@types+react-dom@19.1.3__@types+react@19.1.2_react@19.1.0_react-dom@19.1.0__react@19.1.0",
     "npm:@tailwindcss/postcss@^4.1.5": "4.1.5",
+    "npm:@tanstack/react-router-devtools@^1.120.16": "1.120.16_@tanstack+react-router@1.120.15__react@19.1.0__react-dom@19.1.0___react@19.1.0_react@19.1.0_react-dom@19.1.0__react@19.1.0_solid-js@1.9.7__seroval@1.3.2",
     "npm:@tanstack/react-router@^1.120.15": "1.120.15_react@19.1.0_react-dom@19.1.0__react@19.1.0",
     "npm:@tanstack/router-devtools@^1.120.15": "1.120.15_@tanstack+react-router@1.120.15__react@19.1.0__react-dom@19.1.0___react@19.1.0_react@19.1.0_react-dom@19.1.0__react@19.1.0",
     "npm:@tanstack/router-plugin@^1.120.15": "1.120.15_@tanstack+react-router@1.120.15__react@19.1.0__react-dom@19.1.0___react@19.1.0_vite@6.3.4__@types+node@22.15.3__picomatch@4.0.2_@babel+core@7.27.1_react@19.1.0_react-dom@19.1.0__react@19.1.0_@types+node@22.15.3",
@@ -2371,6 +2372,16 @@
         "solid-js"
       ]
     },
+    "@tanstack/react-router-devtools@1.120.16_@tanstack+react-router@1.120.15__react@19.1.0__react-dom@19.1.0___react@19.1.0_react@19.1.0_react-dom@19.1.0__react@19.1.0_solid-js@1.9.7__seroval@1.3.2": {
+      "integrity": "sha512-DWXmMLknVJJMGP2k5yeUWBDhJOHbV2jVfnZKxtGzA64xXhwDFgU9qpodcmYSq3+kHWsKrd7iX0wc7d27rGwGDA==",
+      "dependencies": [
+        "@tanstack/react-router",
+        "@tanstack/router-devtools-core",
+        "react",
+        "react-dom",
+        "solid-js"
+      ]
+    },
     "@tanstack/react-router@1.120.15_react@19.1.0_react-dom@19.1.0__react@19.1.0": {
       "integrity": "sha512-apzBmXh4pHwqUGU3kD8y2FJMi7rVoUbRxh5oV7v8kEb6Aq5Xpdo+OcpThw8h/M2zv7v4Ef8IoY6WFCKKu3HBjQ==",
       "dependencies": [
@@ -2415,7 +2426,7 @@
       "integrity": "sha512-u7KbvupWSppoEUYuhCBzmWkd1hcODzHhvGIuWZKoQO9q/qeNY5XptbzGqBSUooXyoF4T/pAdCRILF5zFIqexJw==",
       "dependencies": [
         "@tanstack/react-router",
-        "@tanstack/react-router-devtools",
+        "@tanstack/react-router-devtools@1.120.15_@tanstack+react-router@1.120.15__react@19.1.0__react-dom@19.1.0___react@19.1.0_react@19.1.0_react-dom@19.1.0__react@19.1.0_solid-js@1.9.7__seroval@1.3.2",
         "clsx",
         "goober",
         "react",
@@ -7592,6 +7603,7 @@
         "npm:@radix-ui/react-toggle-group@^1.1.9",
         "npm:@radix-ui/react-tooltip@^1.2.4",
         "npm:@tailwindcss/postcss@^4.1.5",
+        "npm:@tanstack/react-router-devtools@^1.120.16",
         "npm:@tanstack/react-router@^1.120.15",
         "npm:@tanstack/router-devtools@^1.120.15",
         "npm:@tanstack/router-plugin@^1.120.15",
diff --git a/package.json b/package.json
index 0e069acd..dc534416 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "@radix-ui/react-toggle-group": "^1.1.9",
     "@radix-ui/react-tooltip": "^1.2.4",
     "@tanstack/react-router": "^1.120.15",
+    "@tanstack/react-router-devtools": "^1.120.16",
     "@tanstack/router-devtools": "^1.120.15",
     "@turf/turf": "^7.2.0",
     "base64-js": "^1.5.1",
diff --git a/src/App.tsx b/src/App.tsx
index c508b89c..78c43813 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -14,6 +14,7 @@ import { CommandPalette } from "@components/CommandPalette/index.tsx";
 import { SidebarProvider } from "@core/stores/sidebarStore.tsx";
 import { useTheme } from "@core/hooks/useTheme.ts";
 import { Outlet } from "@tanstack/react-router";
+import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
 
 export function App() {
   const { getDevice } = useDeviceStore();
@@ -34,6 +35,7 @@ export function App() {
         }}
       />
       <Toaster />
+      <TanStackRouterDevtools position="bottom-right" />
       <DeviceWrapper device={device}>
         <div
           className="flex h-screen flex-col bg-background-primary text-text-primary"
diff --git a/src/index.tsx b/src/index.tsx
index 95c0de83..dbaafd39 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -5,7 +5,6 @@ import { StrictMode, Suspense } from "react";
 import { createRoot } from "react-dom/client";
 import "./i18n/config.ts";
 import { createRouter, RouterProvider } from "@tanstack/react-router";
-import { TanStackRouterDevtools } from "@tanstack/router-devtools";
 import { routeTree } from "@app/routes.tsx";
 
 declare module "@tanstack/react-router" {
@@ -27,7 +26,6 @@ root.render(
   <StrictMode>
     <Suspense fallback={null}>
       <RouterProvider router={router} />
-      <TanStackRouterDevtools position="bottom-right" />
     </Suspense>
   </StrictMode>,
 );