diff --git a/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx b/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
index 24ef7241..e8148046 100644
--- a/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
@@ -25,6 +25,7 @@ import { PageWrapper } from "components/Pages/Page";
 import { decodeQuotePosition } from "./quotePosition";
 import { PollData } from "./fetchPollData";
 import { SharedPageProps } from "./PostPages";
+import { PostPrevNextButtons } from "./PostPrevNextButtons";
 
 export function LinearDocumentPage({
   blocks,
@@ -56,6 +57,8 @@ export function LinearDocumentPage({
 
   const isSubpage = !!pageId;
 
+  console.log("prev/next?: " + preferences.showPrevNext);
+
   return (
     <>
       <PageWrapper
@@ -83,7 +86,9 @@ export function LinearDocumentPage({
           did={did}
           prerenderedCodeBlocks={prerenderedCodeBlocks}
         />
-
+        <PostPrevNextButtons
+          showPrevNext={preferences.showPrevNext && !isSubpage}
+        />
         <ExpandedInteractions
           pageId={pageId}
           showComments={preferences.showComments}
diff --git a/app/lish/[did]/[publication]/[rkey]/PostPrevNextButtons.tsx b/app/lish/[did]/[publication]/[rkey]/PostPrevNextButtons.tsx
new file mode 100644
index 00000000..48a1a99c
--- /dev/null
+++ b/app/lish/[did]/[publication]/[rkey]/PostPrevNextButtons.tsx
@@ -0,0 +1,58 @@
+"use client";
+import { PubLeafletDocument } from "lexicons/api";
+import { usePublicationData } from "../dashboard/PublicationSWRProvider";
+import { getPublicationURL } from "app/lish/createPub/getPublicationURL";
+import { AtUri } from "@atproto/api";
+import { useParams } from "next/navigation";
+import { getPostPageData } from "./getPostPageData";
+import { PostPageContext } from "./PostPageContext";
+import { useContext } from "react";
+import { SpeedyLink } from "components/SpeedyLink";
+import { ArrowRightTiny } from "components/Icons/ArrowRightTiny";
+
+export const PostPrevNextButtons = (props: {
+  showPrevNext: boolean | undefined;
+}) => {
+  let postData = useContext(PostPageContext);
+  let pub = postData?.documents_in_publications[0]?.publications;
+
+  if (!props.showPrevNext || !pub || !postData) return;
+
+  function getPostLink(uri: string) {
+    return pub && uri
+      ? `${getPublicationURL(pub)}/${new AtUri(uri).rkey}`
+      : "leaflet.pub/not-found";
+  }
+  let prevPost = postData?.prevNext?.prev;
+  let nextPost = postData?.prevNext?.next;
+
+  return (
+    <div className="flex flex-col gap-1 w-full px-3 sm:px-4 pb-2 pt-2">
+      {/*<hr className="border-border-light" />*/}
+      <div className="flex justify-between w-full gap-8 ">
+        {nextPost ? (
+          <SpeedyLink
+            href={getPostLink(nextPost.uri)}
+            className="flex gap-1 items-center truncate min-w-0 basis-1/2"
+          >
+            <ArrowRightTiny className="rotate-180 shrink-0" />
+            <div className="min-w-0 truncate">{nextPost.title}</div>
+          </SpeedyLink>
+        ) : (
+          <div />
+        )}
+        {prevPost ? (
+          <SpeedyLink
+            href={getPostLink(prevPost.uri)}
+            className="flex gap-1 items-center truncate min-w-0 basis-1/2 justify-end"
+          >
+            <div className="min-w-0 truncate">{prevPost.title}</div>
+            <ArrowRightTiny className="shrink-0" />
+          </SpeedyLink>
+        ) : (
+          <div />
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/app/lish/[did]/[publication]/[rkey]/getPostPageData.ts b/app/lish/[did]/[publication]/[rkey]/getPostPageData.ts
index 395b5348..aa0cc515 100644
--- a/app/lish/[did]/[publication]/[rkey]/getPostPageData.ts
+++ b/app/lish/[did]/[publication]/[rkey]/getPostPageData.ts
@@ -10,7 +10,10 @@ export async function getPostPageData(uri: string) {
         data,
         uri,
         comments_on_documents(*, bsky_profiles(*)),
-        documents_in_publications(publications(*, publication_subscriptions(*))),
+        documents_in_publications(publications(*,
+          documents_in_publications(documents(uri, data)),
+          publication_subscriptions(*))
+        ),
         document_mentions_in_bsky(*),
         leaflets_in_publications(*)
         `,
@@ -51,10 +54,64 @@ export async function getPostPageData(uri: string) {
         ?.record as PubLeafletPublication.Record
     )?.theme || (document?.data as PubLeafletDocument.Record)?.theme;
 
+  // Calculate prev/next documents from the fetched publication documents
+  let prevNext:
+    | {
+        prev?: { uri: string; title: string };
+        next?: { uri: string; title: string };
+      }
+    | undefined;
+
+  const currentPublishedAt = (document.data as PubLeafletDocument.Record)
+    ?.publishedAt;
+  const allDocs =
+    document.documents_in_publications[0]?.publications
+      ?.documents_in_publications;
+
+  if (currentPublishedAt && allDocs) {
+    // Filter and sort documents by publishedAt
+    const sortedDocs = allDocs
+      .map((dip) => ({
+        uri: dip?.documents?.uri,
+        title: (dip?.documents?.data as PubLeafletDocument.Record).title,
+        publishedAt: (dip?.documents?.data as PubLeafletDocument.Record)
+          .publishedAt,
+      }))
+      .filter((doc) => doc.publishedAt) // Only include docs with publishedAt
+      .sort(
+        (a, b) =>
+          new Date(a.publishedAt!).getTime() -
+          new Date(b.publishedAt!).getTime(),
+      );
+
+    // Find current document index
+    const currentIndex = sortedDocs.findIndex((doc) => doc.uri === uri);
+
+    if (currentIndex !== -1) {
+      prevNext = {
+        prev:
+          currentIndex > 0
+            ? {
+                uri: sortedDocs[currentIndex - 1].uri || "",
+                title: sortedDocs[currentIndex - 1].title,
+              }
+            : undefined,
+        next:
+          currentIndex < sortedDocs.length - 1
+            ? {
+                uri: sortedDocs[currentIndex + 1].uri || "",
+                title: sortedDocs[currentIndex + 1].title,
+              }
+            : undefined,
+      };
+    }
+  }
+
   return {
     ...document,
     quotesAndMentions,
     theme,
+    prevNext,
   };
 }
 
diff --git a/app/lish/[did]/[publication]/dashboard/settings/PostOptions.tsx b/app/lish/[did]/[publication]/dashboard/settings/PostOptions.tsx
index 289cc121..5e4f2275 100644
--- a/app/lish/[did]/[publication]/dashboard/settings/PostOptions.tsx
+++ b/app/lish/[did]/[publication]/dashboard/settings/PostOptions.tsx
@@ -53,7 +53,8 @@ export const PostOptions = (props: {
             showPrevNext: showPrevNext,
           },
         });
-        toast({ type: "success", content: "Posts Updated!" });
+        toast({ type: "success", content: <strong>Posts Updated!</strong> });
+        console.log(record.preferences?.showPrevNext);
         props.setLoading(false);
         mutate("publication-data");
       }}