diff --git a/app/src/components/language.svelte b/app/src/components/language.svelte
index 5bfdee8..64f5274 100644
--- a/app/src/components/language.svelte
+++ b/app/src/components/language.svelte
@@ -9,7 +9,7 @@
   }
 </script>
 
-<form action="/" method="get" {onsubmit}>
+<form method="get" {onsubmit}>
   <input type="hidden" name="l" value={$next.code} />
   <button type="submit">{$next.icon}</button>
 </form>
diff --git a/app/src/routes/+layout.server.js b/app/src/routes/+layout.server.js
index e2f11b8..99fe8a7 100644
--- a/app/src/routes/+layout.server.js
+++ b/app/src/routes/+layout.server.js
@@ -12,7 +12,7 @@ export async function load({ cookies, request, url }) {
 
   if (locale) {
     set_locale(cookies, locale);
-    return redirect(307, "/");
+    return redirect(307, url.pathname);
   }
 
   // attempt get the preferred locale from cookies