diff --git a/templates/reader.templ b/templates/reader.templ
index bfcd1c7..75c8dc1 100644
--- a/templates/reader.templ
+++ b/templates/reader.templ
@@ -84,7 +84,7 @@ templ ReaderChrome(user User, metadata ReaderMetadata, progress ReadingProgress)
 		<!-- Top bar -->
 		<div id="reader-topbar" class="fixed top-0 left-0 right-0 bg-opacity-95 backdrop-blur border-b z-40 pt-[env(safe-area-inset-top)]" style="background-color: var(--bg-primary);">
 			<div class="flex items-center justify-between px-3 py-2 sm:px-4 sm:py-3">
-				<a href={ "/media/" + metadata.MediaItemID } class="text-base sm:text-lg hover:underline">
+				<a id="reader-back" href={ "/media/" + metadata.MediaItemID } class="text-base sm:text-lg hover:underline">
 					← Back
 				</a>
 				<h1 class="text-base sm:text-lg font-semibold hidden sm:block sm:truncate">{ metadata.Title }</h1>
diff --git a/templates/reader_templ.go b/templates/reader_templ.go
index d4a5f48..c18b0ff 100644
--- a/templates/reader_templ.go
+++ b/templates/reader_templ.go
@@ -163,14 +163,14 @@ func ReaderChrome(user User, metadata ReaderMetadata, progress ReadingProgress)
 			templ_7745c5c3_Var4 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<div id=\"reader-chrome\" class=\"transition-opacity duration-300\"><!-- Top bar --><div id=\"reader-topbar\" class=\"fixed top-0 left-0 right-0 bg-opacity-95 backdrop-blur border-b z-40 pt-[env(safe-area-inset-top)]\" style=\"background-color: var(--bg-primary);\"><div class=\"flex items-center justify-between px-3 py-2 sm:px-4 sm:py-3\"><a href=\"")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<div id=\"reader-chrome\" class=\"transition-opacity duration-300\"><!-- Top bar --><div id=\"reader-topbar\" class=\"fixed top-0 left-0 right-0 bg-opacity-95 backdrop-blur border-b z-40 pt-[env(safe-area-inset-top)]\" style=\"background-color: var(--bg-primary);\"><div class=\"flex items-center justify-between px-3 py-2 sm:px-4 sm:py-3\"><a id=\"reader-back\" href=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var5 templ.SafeURL
 		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinURLErrs("/media/" + metadata.MediaItemID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/reader.templ`, Line: 87, Col: 46}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `templates/reader.templ`, Line: 87, Col: 63}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 		if templ_7745c5c3_Err != nil {
diff --git a/web/src/reader/reader.ts b/web/src/reader/reader.ts
index 748becb..7b1d4fa 100644
--- a/web/src/reader/reader.ts
+++ b/web/src/reader/reader.ts
@@ -407,6 +407,34 @@ document.addEventListener("alpine:init", () => {
       label: string;
       startPage: number;
     }[],
+    init() {
+      const link = document.getElementById("reader-back");
+      if (!link) return;
+      const storageKey = "reader_back";
+      if (document.referrer) {
+        try {
+          const ref = new URL(document.referrer);
+          if (
+            ref.origin === window.location.origin &&
+            !ref.pathname.startsWith("/readers/") &&
+            ref.pathname !== window.location.pathname
+          ) {
+            sessionStorage.setItem(storageKey, ref.pathname + ref.search);
+          }
+        } catch {}
+      } else {
+        sessionStorage.removeItem(storageKey);
+      }
+      const backUrl =
+        sessionStorage.getItem(storageKey) ||
+        link.getAttribute("href") ||
+        "/dashboard";
+      link.addEventListener("click", (e: Event) => {
+        e.preventDefault();
+        sessionStorage.removeItem(storageKey);
+        window.location.href = backUrl;
+      });
+    },
     async initReader(config: {
       mediaItemId: string;
       fileUrl: string;