diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
index 3056b7b..f26affc 100644
--- a/frontend/src/App.svelte
+++ b/frontend/src/App.svelte
@@ -6,6 +6,8 @@
 	import * as srouter from "svelte-spa-router";
 	import { location } from "svelte-spa-router";
 
+	const energyLocRegex = /^\/(?:Energy)?(?!Weight)/;
+	const weightLocRegex = /^\/(?:Weight)(?!Energy)/;
 	function keyDown(event: KeyboardEvent) {
 		if (event.ctrlKey && event.key == "r") {
 			window.location.reload();
@@ -14,10 +16,10 @@
 			Close();
 		}
 		if (event.ctrlKey && event.key == "Tab") {
-			if ($location == "/") {
-				srouter.replace("/Weight");
-			} else if ($location == "/Weight") {
-				srouter.replace("/");
+			if (energyLocRegex.test($location)) {
+				srouter.replace($location.replace(energyLocRegex, "/Weight"));
+			} else if (weightLocRegex.test($location)) {
+				srouter.replace($location.replace(weightLocRegex, "/Energy"));
 			}
 		}
 	}