diff --git a/actions/updatePublicationPage.ts b/actions/updatePublicationPage.ts
new file mode 100644
index 00000000..72f62b2d
--- /dev/null
+++ b/actions/updatePublicationPage.ts
@@ -0,0 +1,30 @@
+"use server";
+import { getIdentityData } from "actions/getIdentityData";
+import { supabaseServerClient } from "supabase/serverClient";
+
+export async function updatePublicationPage(args: {
+  publication_uri: string;
+  page_id: number;
+  title: string;
+  path: string;
+}): Promise<{ success: boolean }> {
+  let identity = await getIdentityData();
+  if (!identity || !identity.atp_did) return { success: false };
+
+  let { data: publication } = await supabaseServerClient
+    .from("publications")
+    .select("uri, identity_did")
+    .eq("uri", args.publication_uri)
+    .single();
+  if (!publication || publication.identity_did !== identity.atp_did)
+    return { success: false };
+
+  let { error } = await supabaseServerClient
+    .from("publication_pages")
+    .update({ title: args.title, path: args.path })
+    .eq("id", args.page_id)
+    .eq("publication", args.publication_uri);
+  if (error) return { success: false };
+
+  return { success: true };
+}
diff --git a/app/(app)/lish/[did]/[publication]/PublicationContent.tsx b/app/(app)/lish/[did]/[publication]/PublicationContent.tsx
index 137f8383..6d5a4b14 100644
--- a/app/(app)/lish/[did]/[publication]/PublicationContent.tsx
+++ b/app/(app)/lish/[did]/[publication]/PublicationContent.tsx
@@ -1,10 +1,6 @@
 import React from "react";
 import { PublicationHomeLayout } from "./PublicationHomeLayout";
 import { PublicationAuthor } from "./PublicationAuthor";
-import { PublicationHeader } from "./PublicationHeader";
-import { PublicationNav } from "./PublicationNav";
-import { PublicationStickyHeader } from "./PublicationStickyHeader";
-import { PublicationFullHeader } from "./PublicationFullHeader";
 import {
   normalizePublicationRecord,
   normalizeDocumentRecord,
@@ -91,56 +87,31 @@ export const PublicationContent = ({
       <PublicationHomeLayout
         uri={publication.uri}
         showPageBackground={!!showPageBackground}
-        stickyHeader={
-          navPages.length > 0 ? (
-            <PublicationStickyHeader
-              nav={
-                <PublicationNav
-                  publicationUrl={getPublicationURL(publication)}
-                  pages={navPages}
-                  activePath="/"
-                />
-              }
-            >
-              <PublicationHeader
-                variant="inline"
-                iconUrl={
-                  record?.icon ? blobRefToSrc(record.icon.ref, did) : undefined
-                }
-                publicationName={publication.name}
-              />
-            </PublicationStickyHeader>
-          ) : (
-            <PublicationFullHeader>
-              <PublicationHeader
-                iconUrl={
-                  record?.icon ? blobRefToSrc(record.icon.ref, did) : undefined
-                }
-                publicationName={publication.name}
-                description={record?.description}
-                author={
-                  profile ? (
-                    <PublicationAuthor
-                      did={profile.did}
-                      displayName={profile.displayName}
-                      handle={profile.handle}
-                    />
-                  ) : undefined
-                }
-                subscribeButton={
-                  <div className="max-w-sm mx-auto">
-                    <SubscribeInput
-                      publicationUri={publication.uri}
-                      publicationUrl={record?.url}
-                      publicationName={record?.name ?? publication.name}
-                      publicationDescription={record?.description}
-                      newsletterMode={newsletterMode}
-                    />
-                  </div>
-                }
-              />
-            </PublicationFullHeader>
-          )
+        iconUrl={record?.icon ? blobRefToSrc(record.icon.ref, did) : undefined}
+        publicationName={publication.name}
+        description={record?.description}
+        navPages={navPages}
+        publicationUrl={getPublicationURL(publication)}
+        activePath="/"
+        author={
+          profile ? (
+            <PublicationAuthor
+              did={profile.did}
+              displayName={profile.displayName}
+              handle={profile.handle}
+            />
+          ) : undefined
+        }
+        subscribeButton={
+          <div className="max-w-sm mx-auto">
+            <SubscribeInput
+              publicationUri={publication.uri}
+              publicationUrl={record?.url}
+              publicationName={record?.name ?? publication.name}
+              publicationDescription={record?.description}
+              newsletterMode={newsletterMode}
+            />
+          </div>
         }
       >
         <PublicationPostsList
diff --git a/app/(app)/lish/[did]/[publication]/PublicationFullHeader.tsx b/app/(app)/lish/[did]/[publication]/PublicationFullHeader.tsx
deleted file mode 100644
index 5f243c41..00000000
--- a/app/(app)/lish/[did]/[publication]/PublicationFullHeader.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from "react";
-
-export function PublicationFullHeader(props: { children: React.ReactNode }) {
-  return (
-    <div className="pubFullHeader shrink-0">
-      <div className="sm:max-w-(--page-width-units) w-full mx-auto px-3 sm:px-4 pt-5">
-        {props.children}
-      </div>
-    </div>
-  );
-}
diff --git a/app/(app)/lish/[did]/[publication]/PublicationHomeLayout.tsx b/app/(app)/lish/[did]/[publication]/PublicationHomeLayout.tsx
index 4b052694..2cda91a6 100644
--- a/app/(app)/lish/[did]/[publication]/PublicationHomeLayout.tsx
+++ b/app/(app)/lish/[did]/[publication]/PublicationHomeLayout.tsx
@@ -1,17 +1,60 @@
 "use client";
 
+import React from "react";
 import { usePreserveScroll } from "src/hooks/usePreserveScroll";
+import { PublicationHeader } from "./PublicationHeader";
+import { PublicationNav, type PublicationNavPage } from "./PublicationNav";
+import { PublicationStickyHeader } from "./PublicationStickyHeader";
 
 export function PublicationHomeLayout(props: {
   uri: string;
   showPageBackground: boolean;
-  stickyHeader?: React.ReactNode;
+  iconUrl?: string;
+  publicationName: string;
+  description?: string;
+  author?: React.ReactNode;
+  subscribeButton?: React.ReactNode;
+  navPages: PublicationNavPage[];
+  publicationUrl: string;
+  activePath: string;
   children: React.ReactNode;
 }) {
   let { ref } = usePreserveScroll<HTMLDivElement>(props.uri);
+  let hasNav = props.navPages.length > 0;
+
+  let header = hasNav ? (
+    <PublicationStickyHeader
+      nav={
+        <PublicationNav
+          publicationUrl={props.publicationUrl}
+          pages={props.navPages}
+          activePath={props.activePath}
+        />
+      }
+    >
+      <PublicationHeader
+        variant="inline"
+        iconUrl={props.iconUrl}
+        publicationName={props.publicationName}
+      />
+    </PublicationStickyHeader>
+  ) : (
+    <div className="pubFullHeader shrink-0">
+      <div className="sm:max-w-(--page-width-units) w-full mx-auto px-3 sm:px-4 pt-5">
+        <PublicationHeader
+          iconUrl={props.iconUrl}
+          publicationName={props.publicationName}
+          description={props.description}
+          author={props.author}
+          subscribeButton={props.subscribeButton}
+        />
+      </div>
+    </div>
+  );
+
   let inner = (
     <>
-      {props.stickyHeader}
+      {header}
       <div className="pubContent sm:max-w-(--page-width-units) w-full mx-auto px-3 sm:px-4 pb-5">
         {props.children}
       </div>
diff --git a/app/(app)/lish/[did]/[publication]/PublicationStickyHeader.tsx b/app/(app)/lish/[did]/[publication]/PublicationStickyHeader.tsx
index dd653e86..68e9409d 100644
--- a/app/(app)/lish/[did]/[publication]/PublicationStickyHeader.tsx
+++ b/app/(app)/lish/[did]/[publication]/PublicationStickyHeader.tsx
@@ -3,13 +3,11 @@ import { useEffect, useRef } from "react";
 import { usePathname } from "next/navigation";
 
 export function PublicationStickyHeader(props: {
-  sticky?: boolean;
   nav: React.ReactNode;
   children: React.ReactNode;
 }) {
   let ref = useRef<HTMLDivElement>(null);
   let pathname = usePathname();
-  let sticky = props.sticky ?? true;
 
   useEffect(() => {
     let el = ref.current;
@@ -62,11 +60,7 @@ export function PublicationStickyHeader(props: {
   return (
     <div
       ref={ref}
-      className={
-        sticky
-          ? "pubStickyHeader sticky top-0 z-10 bg-bg-page shrink-0"
-          : "pubStickyHeader shrink-0"
-      }
+      className="pubStickyHeader sticky top-0 z-10 bg-bg-page shrink-0"
     >
       <div
         className="sm:max-w-(--page-width-units) w-full mx-auto px-3 sm:px-4"
diff --git a/app/(app)/lish/[did]/[publication]/[rkey]/PublicationPageRenderer.tsx b/app/(app)/lish/[did]/[publication]/[rkey]/PublicationPageRenderer.tsx
index e24ac9b4..d97c4ae2 100644
--- a/app/(app)/lish/[did]/[publication]/[rkey]/PublicationPageRenderer.tsx
+++ b/app/(app)/lish/[did]/[publication]/[rkey]/PublicationPageRenderer.tsx
@@ -23,11 +23,7 @@ import type { DocumentContextValue } from "contexts/DocumentContext";
 import {
   type PublicationPostsListPost,
 } from "../PublicationPostsList";
-import { PublicationNav } from "../PublicationNav";
-import { PublicationHeader } from "../PublicationHeader";
 import { PublicationHomeLayout } from "../PublicationHomeLayout";
-import { PublicationStickyHeader } from "../PublicationStickyHeader";
-import { PublicationFullHeader } from "../PublicationFullHeader";
 import { getPublicationURL } from "app/(app)/lish/createPub/getPublicationURL";
 import { blobRefToSrc } from "src/utils/blobRefToSrc";
 
@@ -180,41 +176,16 @@ export async function PublicationPageRenderer({
             <PublicationHomeLayout
               uri={publication.uri}
               showPageBackground={showPageBackground}
-              stickyHeader={
-                navPages.length > 0 ? (
-                  <PublicationStickyHeader
-                    nav={
-                      <PublicationNav
-                        publicationUrl={getPublicationURL(publication)}
-                        pages={navPages}
-                        activePath={page.path}
-                      />
-                    }
-                  >
-                    <PublicationHeader
-                      variant="inline"
-                      iconUrl={
-                        normalizedPublication?.icon
-                          ? blobRefToSrc(normalizedPublication.icon.ref, did)
-                          : undefined
-                      }
-                      publicationName={publication.name}
-                    />
-                  </PublicationStickyHeader>
-                ) : (
-                  <PublicationFullHeader>
-                    <PublicationHeader
-                      iconUrl={
-                        normalizedPublication?.icon
-                          ? blobRefToSrc(normalizedPublication.icon.ref, did)
-                          : undefined
-                      }
-                      publicationName={publication.name}
-                      description={normalizedPublication?.description}
-                    />
-                  </PublicationFullHeader>
-                )
+              iconUrl={
+                normalizedPublication?.icon
+                  ? blobRefToSrc(normalizedPublication.icon.ref, did)
+                  : undefined
               }
+              publicationName={publication.name}
+              description={normalizedPublication?.description}
+              navPages={navPages}
+              publicationUrl={getPublicationURL(publication)}
+              activePath={page.path}
             >
               <div className="pubPageContent pt-6">
                 <PostContent
diff --git a/app/(app)/lish/[did]/[publication]/dashboard/PublicationSWRProvider.tsx b/app/(app)/lish/[did]/[publication]/dashboard/PublicationSWRProvider.tsx
index 65217a34..c72f99ef 100644
--- a/app/(app)/lish/[did]/[publication]/dashboard/PublicationSWRProvider.tsx
+++ b/app/(app)/lish/[did]/[publication]/dashboard/PublicationSWRProvider.tsx
@@ -2,8 +2,8 @@
 
 import type { GetPublicationDataReturnType } from "app/api/rpc/[command]/get_publication_data";
 import { callRPC } from "app/api/rpc/client";
-import { createContext, useContext, useEffect, useMemo } from "react";
-import useSWR, { SWRConfig, KeyedMutator, mutate } from "swr";
+import { createContext, useContext, useMemo } from "react";
+import useSWR, { SWRConfig, KeyedMutator } from "swr";
 import { produce, Draft as ImmerDraft } from "immer";
 import {
   normalizePublicationRecord,
@@ -24,9 +24,6 @@ export function PublicationSWRDataProvider(props: {
   children: React.ReactNode;
 }) {
   let key = `publication-data-${props.publication_did}-${props.publication_rkey}`;
-  useEffect(() => {
-    mutate(key, props.publication_data);
-  }, [props.publication_data]);
   return (
     <PublicationContext
       value={{ name: props.publication_rkey, did: props.publication_did }}
diff --git a/app/(app)/lish/[did]/[publication]/edit/[[...route]]/PublicationPagesNav.tsx b/app/(app)/lish/[did]/[publication]/edit/[[...route]]/PublicationPagesNav.tsx
index 2dbbd400..2b81b227 100644
--- a/app/(app)/lish/[did]/[publication]/edit/[[...route]]/PublicationPagesNav.tsx
+++ b/app/(app)/lish/[did]/[publication]/edit/[[...route]]/PublicationPagesNav.tsx
@@ -25,11 +25,11 @@ import { SpeedyLink } from "components/SpeedyLink";
 import { ButtonPrimary, ButtonSecondary, ButtonTertiary } from "components/Buttons";
 import { InputWithLabel } from "components/Input";
 import { Popover } from "components/Popover";
-import { Modal } from "components/Modal";
 import { AddTiny } from "components/Icons/AddTiny";
-import { CloseTiny } from "components/Icons/CloseTiny";
+import { EditTiny } from "components/Icons/EditTiny";
 import { createPublicationPage } from "actions/createPublicationPage";
 import { deletePublicationPage } from "actions/deletePublicationPage";
+import { updatePublicationPage } from "actions/updatePublicationPage";
 import { reorderPublicationPages } from "actions/reorderPublicationPages";
 import {
   usePublicationData,
@@ -161,6 +161,19 @@ export function PublicationPagesNav(props: {
                     active={isActive}
                     publicationUri={publicationUri}
                     canDelete={sortedPages.length > 1}
+                    onUpdated={(updated) => {
+                      mutatePublicationData(mutate, (draft) => {
+                        let p = draft.publication?.publication_pages.find(
+                          (p) => p.id === page.id,
+                        );
+                        if (p) {
+                          p.title = updated.title;
+                          p.path = updated.path;
+                        }
+                      });
+                      if (isActive && updated.path !== page.path)
+                        router.push(hrefForPath(updated.path));
+                    }}
                     onDeleted={() => {
                       mutatePublicationData(mutate, (draft) => {
                         let pages = draft.publication?.publication_pages;
@@ -231,6 +244,7 @@ function SortableTab(props: {
   active: boolean;
   publicationUri: string | undefined;
   canDelete: boolean;
+  onUpdated: (updated: { title: string; path: string }) => void;
   onDeleted: () => void;
 }) {
   let {
@@ -242,7 +256,11 @@ function SortableTab(props: {
     transition,
     isDragging,
   } = useSortable({ id: props.page.id });
-  let [confirmOpen, setConfirmOpen] = useState(false);
+  let [popoverOpen, setPopoverOpen] = useState(false);
+  let [mode, setMode] = useState<"edit" | "confirm">("edit");
+  let [name, setName] = useState(props.page.title);
+  let [path, setPath] = useState(props.page.path ?? "/");
+  let [saving, setSaving] = useState(false);
   let [deleting, setDeleting] = useState(false);
 
   let style = {
@@ -251,6 +269,35 @@ function SortableTab(props: {
     zIndex: isDragging ? 1 : undefined,
   };
 
+  function handleOpenChange(o: boolean) {
+    setPopoverOpen(o);
+    if (o) {
+      setName(props.page.title);
+      setPath(props.page.path ?? "/");
+      setMode("edit");
+    }
+  }
+
+  async function handleSave(e: React.FormEvent) {
+    e.preventDefault();
+    if (!props.publicationUri || saving) return;
+    let trimmedPath = path.trim();
+    if (!trimmedPath) return;
+    if (!trimmedPath.startsWith("/")) trimmedPath = "/" + trimmedPath;
+    let trimmedTitle = name.trim();
+    setSaving(true);
+    let result = await updatePublicationPage({
+      publication_uri: props.publicationUri,
+      page_id: props.page.id,
+      title: trimmedTitle,
+      path: trimmedPath,
+    });
+    setSaving(false);
+    if (!result.success) return;
+    setPopoverOpen(false);
+    props.onUpdated({ title: trimmedTitle, path: trimmedPath });
+  }
+
   async function handleDelete() {
     if (!props.publicationUri || deleting) return;
     setDeleting(true);
@@ -260,7 +307,7 @@ function SortableTab(props: {
     });
     setDeleting(false);
     if (!result.success) return;
-    setConfirmOpen(false);
+    setPopoverOpen(false);
     props.onDeleted();
   }
 
@@ -299,39 +346,84 @@ function SortableTab(props: {
       >
         {props.page.title || props.page.path || "/"}
       </SpeedyLink>
-      {props.canDelete && (
-      <Modal
-        open={confirmOpen}
-        onOpenChange={setConfirmOpen}
+      <Popover
         asChild
+        align="end"
+        open={popoverOpen}
+        onOpenChange={handleOpenChange}
+        className="w-64"
         trigger={
           <button
             type="button"
-            aria-label="Delete page"
+            aria-label="Edit page"
             className="shrink-0 mx-1 p-0.5 rounded text-inherit opacity-0 group-hover/sortable-tab:opacity-100 focus:opacity-100 hover:bg-border-light"
           >
-            <CloseTiny className="w-3 h-3" />
+            <EditTiny className="w-3 h-3" />
           </button>
         }
-        title="Delete page?"
       >
-        <div className="text-secondary text-sm pb-3">
-          This will permanently delete{" "}
-          <span className="font-bold text-primary">
-            {props.page.title || props.page.path || "/"}
-          </span>
-          .
-        </div>
-        <div className="flex gap-2 justify-end items-center">
-          <ButtonTertiary onClick={() => setConfirmOpen(false)}>
-            Nevermind
-          </ButtonTertiary>
-          <ButtonPrimary onClick={handleDelete} disabled={deleting}>
-            {deleting ? "Deleting..." : "Delete"}
-          </ButtonPrimary>
-        </div>
-      </Modal>
-      )}
+        {mode === "edit" ? (
+          <form
+            onSubmit={handleSave}
+            onKeyDown={(e) => {
+              if (e.key === "Tab") e.stopPropagation();
+            }}
+            className="flex flex-col gap-2"
+          >
+            <InputWithLabel
+              label="Name"
+              type="text"
+              name="page-title"
+              autoComplete="off"
+              value={name}
+              onChange={(e) => setName(e.currentTarget.value)}
+              autoFocus
+            />
+            <InputWithLabel
+              label="Path"
+              type="text"
+              name="page-path"
+              autoComplete="off"
+              value={path}
+              onChange={(e) => setPath(e.currentTarget.value)}
+              placeholder="/about"
+            />
+            <div className="flex gap-2 justify-between items-center">
+              {props.canDelete ? (
+                <ButtonTertiary
+                  type="button"
+                  onClick={() => setMode("confirm")}
+                >
+                  Delete
+                </ButtonTertiary>
+              ) : (
+                <div />
+              )}
+              <ButtonPrimary type="submit" disabled={saving}>
+                {saving ? "Saving..." : "Save"}
+              </ButtonPrimary>
+            </div>
+          </form>
+        ) : (
+          <div className="flex flex-col gap-2">
+            <div className="text-secondary text-sm pb-1">
+              This will permanently delete{" "}
+              <span className="font-bold text-primary">
+                {props.page.title || props.page.path || "/"}
+              </span>
+              .
+            </div>
+            <div className="flex gap-2 justify-end items-center">
+              <ButtonTertiary type="button" onClick={() => setMode("edit")}>
+                Cancel
+              </ButtonTertiary>
+              <ButtonPrimary onClick={handleDelete} disabled={deleting}>
+                {deleting ? "Deleting..." : "Delete"}
+              </ButtonPrimary>
+            </div>
+          </div>
+        )}
+      </Popover>
     </div>
   );
 }
diff --git a/app/(app)/lish/[did]/[publication]/edit/[[...route]]/layout.tsx b/app/(app)/lish/[did]/[publication]/edit/[[...route]]/layout.tsx
index 97d3788d..a262e887 100644
--- a/app/(app)/lish/[did]/[publication]/edit/[[...route]]/layout.tsx
+++ b/app/(app)/lish/[did]/[publication]/edit/[[...route]]/layout.tsx
@@ -12,7 +12,6 @@ import { PublicationSWRDataProvider } from "../../dashboard/PublicationSWRProvid
 import { PublicationPagesNav } from "./PublicationPagesNav";
 import { PublicationEditHeader } from "./PublicationEditHeader";
 import { PublicationHeader } from "../../PublicationHeader";
-import { PublicationStickyHeader } from "../../PublicationStickyHeader";
 import { PublicationEditDirtyProvider } from "./dirtyContext";
 
 export async function generateMetadata(props: {
@@ -99,22 +98,20 @@ export default async function PublicationEditLayout(props: {
               publicationName={params.publication}
             />
             <div className="pubWrapper flex flex-col grow min-h-0 bg-bg-page rounded-t-lg overflow-hidden">
-              <PublicationStickyHeader
-                sticky={false}
-                nav={
-                  <PublicationPagesNav
-                    did={params.did}
-                    publicationName={params.publication}
+              <div className="shrink-0">
+                <div className="sm:max-w-(--page-width-units) w-full mx-auto px-3 sm:px-4 pt-5">
+                  <PublicationHeader
+                    variant="inline"
+                    iconUrl={iconUrl}
+                    publicationName={publication.name}
+                    description={record?.description}
                   />
-                }
-              >
-                <PublicationHeader
-                  variant="inline"
-                  iconUrl={iconUrl}
-                  publicationName={publication.name}
-                  description={record?.description}
+                </div>
+                <PublicationPagesNav
+                  did={params.did}
+                  publicationName={params.publication}
                 />
-              </PublicationStickyHeader>
+              </div>
               <div className="grow min-h-0 flex flex-col">{props.children}</div>
             </div>
           </div>