4 files changed, 9 insertions, 4 deletions
diff --git a/src/routes/(app)/+layout.server.ts b/src/routes/(app)/+layout.server.ts
index ef25388d..e28d8b56 100644
--- a/src/routes/(app)/+layout.server.ts
+++ b/src/routes/(app)/+layout.server.ts
@@ -46,5 +46,6 @@ export async function load({ cookies, request, url, params }) {
 	}
 
 	const theme = cookies.get("theme") || "light";
+
 	return { user, token, subject, theme };
 }
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index d037e5be..af4dbf2c 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -32,6 +32,7 @@
   $effect(() => (theme = $themeStore));
 
   afterNavigate(() => {
+    document.cookie = `pathname=${$page.url.pathname}; path=/; max-age=86400`;
     if (user) {
       preloadData(`/${user.username}`);
       preloadData(`/${user.username}/receive`);
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 79a89d47..af4a6a5c 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -5,6 +5,9 @@ import { addIcon } from "iconify-icon";
 import cookies from "js-cookie";
 
 export const ssr = false;
+const expires = new Date();
+expires.setSeconds(expires.getSeconds() + 21000000);
+const opts = { path: "/", expires };
 
 /** @type {import('@sveltejs/kit').Load} */
 export const load = async ({ data }) => {
@@ -24,10 +27,8 @@ export const load = async ({ data }) => {
 				? "dark"
 				: "light";
 
-			const expires = new Date();
-			expires.setSeconds(expires.getSeconds() + 21000000);
+			cookies.set("theme", theme, opts);
 
-			cookies.set("theme", theme, { path: "/", expires });
 			if (theme === "dark") setTimeout(() => themeStore.set(theme), 100);
 		}
 	}
diff --git a/src/routes/start/+server.ts b/src/routes/start/+server.ts
index 58bca85f..b80fc762 100644
--- a/src/routes/start/+server.ts
+++ b/src/routes/start/+server.ts
@@ -1,9 +1,11 @@
 import { redirect } from "@sveltejs/kit";
 
 export async function GET({ cookies }) {
+	const pathname = cookies.get("pathname");
 	const username = cookies.get("username");
 	if (username) {
-		redirect(307, `/${username}/receive`);
+		if (pathname) redirect(307, pathname);
+		else redirect(307, `/${username}/receive`);
 	}
 
 	redirect(307, "/");