diff --git a/src/routes/graphs/+layout.server.ts b/src/routes/graphs/+layout.server.ts
deleted file mode 100644
index a63087a..0000000
--- a/src/routes/graphs/+layout.server.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-
-export function load({ url }: { url: URL }) {
-  if (url.pathname == '/graphs') {
-    throw redirect(302, '/graphs/tab');
-  }
-  
-}
\ No newline at end of file
diff --git a/src/routes/graphs/+layout.svelte b/src/routes/graphs/+layout.svelte
index 16da867..17c17b6 100644
--- a/src/routes/graphs/+layout.svelte
+++ b/src/routes/graphs/+layout.svelte
@@ -1,6 +1,35 @@
 <script lang="ts">
 	import SubNav from './SubNav.svelte';
 	import '../styles.css';
+	import { goto } from "$app/navigation";
+	import { page } from "$app/stores";
+	import GraphsTabStore from '$lib/stores/GraphsTab';
+
+  let graphsTab = "tab";
+  // Tab Detection
+  GraphsTabStore.subscribe(tab => {
+    graphsTab = tab;
+    if (typeof localStorage !== 'undefined') {
+      localStorage.setItem('graphsTab', graphsTab);
+    }
+  })
+
+  page.subscribe((tab) => {
+    if (tab && tab.route && tab.route.id) {
+      let currentTab;
+      const tmp = tab.route.id.split("/").at(-1);
+      if (typeof tmp === "string") {
+        currentTab = tmp;
+      }
+      else {
+        currentTab = "graphs";
+      }
+
+      if (currentTab == "graphs") {
+        goto('/graphs/' + graphsTab);
+      }
+    }
+  })
 </script>