diff --git a/desktop/src/features/agents/ui/PersonaShareDialog.tsx b/desktop/src/features/agents/ui/PersonaShareDialog.tsx
index 690658cd9..ece93ccf3 100644
--- a/desktop/src/features/agents/ui/PersonaShareDialog.tsx
+++ b/desktop/src/features/agents/ui/PersonaShareDialog.tsx
@@ -66,7 +66,7 @@ type PersonaShareDialogProps = {
 };
 
 type SnapshotShareDialogProps = {
-  beforeExport?: React.ReactNode;
+  afterLink?: React.ReactNode;
   displayName: string;
   encodeSnapshot: (
     memoryLevel: SnapshotMemoryLevel,
@@ -238,7 +238,7 @@ function ShareLevelControl({
 }
 
 export function SnapshotShareDialog({
-  beforeExport,
+  afterLink,
   displayName,
   encodeSnapshot,
   hasMemoryOptions,
@@ -696,10 +696,18 @@ export function SnapshotShareDialog({
                   </motion.button>
                 </Button>
               </div>
+              {afterLink ? (
+                <>
+                  <Separator
+                    className="my-4 bg-input/40"
+                    data-testid={`${testIdPrefix}-catalog-divider`}
+                  />
+                  {afterLink}
+                </>
+              ) : null}
             </section>
           </div>
         </div>
-        {beforeExport}
         <button
           className="relative flex min-h-14 w-full items-center gap-3 rounded-2xl bg-background px-5 py-4 text-left text-sm font-medium shadow-2xl outline-hidden transition-colors hover:bg-muted focus-visible:bg-muted disabled:cursor-default disabled:opacity-100"
           data-testid={`${testIdPrefix}-export`}
@@ -756,13 +764,15 @@ export function PersonaShareDialog({
 
   return (
     <SnapshotShareDialog
-      beforeExport={
+      afterLink={
         persona.isBuiltIn ? null : (
           <section
-            className="relative flex min-h-16 w-full items-center gap-3 rounded-2xl bg-background px-5 py-4 shadow-2xl"
+            className="flex min-h-16 w-full items-center gap-3"
             data-testid="persona-share-catalog"
           >
-            <BookUser className="h-4 w-4 shrink-0 text-muted-foreground" />
+            <span className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-muted text-muted-foreground">
+              <BookUser className="h-4 w-4" />
+            </span>
             <div className="min-w-0 flex-1">
               <label className="text-sm font-medium" htmlFor={switchId}>
                 Share to catalog
diff --git a/desktop/tests/e2e/agents.spec.ts b/desktop/tests/e2e/agents.spec.ts
index 8a756ca99..9d5400d21 100644
--- a/desktop/tests/e2e/agents.spec.ts
+++ b/desktop/tests/e2e/agents.spec.ts
@@ -817,6 +817,7 @@ test("custom personas share with people and keep export separate", async ({
   const linkIcon = page.getByTestId("persona-share-link-icon");
   const linkCopy = page.getByTestId("persona-share-link-copy");
   const linkDivider = page.getByTestId("persona-share-link-divider");
+  const catalogDivider = page.getByTestId("persona-share-catalog-divider");
   const staticLinkAccess = page.getByTestId("persona-share-link-access");
   await waitForAnimations(page);
   const [
@@ -825,6 +826,7 @@ test("custom personas share with people and keep export separate", async ({
     linkIconBox,
     linkCopyBox,
     linkDividerBox,
+    catalogDividerBox,
     staticLinkAccessBox,
   ] = await Promise.all([
     linkRow.boundingBox(),
@@ -832,6 +834,7 @@ test("custom personas share with people and keep export separate", async ({
     linkIcon.boundingBox(),
     linkCopy.boundingBox(),
     linkDivider.boundingBox(),
+    catalogDivider.boundingBox(),
     staticLinkAccess.boundingBox(),
   ]);
   const sendDescriptionBox = await sendDescription.boundingBox();
@@ -864,17 +867,11 @@ test("custom personas share with people and keep export separate", async ({
           (staticLinkAccessBox?.height ?? 0) / 2),
     ),
   ).toBeLessThanOrEqual(1);
-  const shareMainCardForLinkSpacing = page.getByTestId(
-    "persona-share-main-card",
-  );
-  const shareMainCardForLinkSpacingBox =
-    await shareMainCardForLinkSpacing.boundingBox();
   const gapAboveCopyLink =
     (initialCopyLinkButtonBox?.y ?? 0) -
     ((linkDividerBox?.y ?? 0) + (linkDividerBox?.height ?? 0));
   const gapBelowCopyLink =
-    (shareMainCardForLinkSpacingBox?.y ?? 0) +
-    (shareMainCardForLinkSpacingBox?.height ?? 0) -
+    (catalogDividerBox?.y ?? 0) -
     ((initialCopyLinkButtonBox?.y ?? 0) +
       (initialCopyLinkButtonBox?.height ?? 0));
   expect(Math.abs(gapAboveCopyLink - gapBelowCopyLink)).toBeLessThanOrEqual(1);
@@ -910,23 +907,15 @@ test("custom personas share with people and keep export separate", async ({
   await expect(shareDialog.getByText("File format")).toHaveCount(0);
   const shareMainCard = page.getByTestId("persona-share-main-card");
   const exportAgentRow = page.getByTestId("persona-share-export");
-  const catalogSection = page.getByTestId("persona-share-catalog");
-  const catalogToggle = page.getByTestId("persona-share-show-in-catalog");
   await expect(exportAgentRow).toHaveText("Export agent");
-  await expect(catalogSection).toContainText("Share to catalog");
-  await expect(catalogSection).toContainText(
-    "Let anyone in this community find and use a copy of this agent.",
-  );
-  await expect(catalogToggle).toHaveAttribute("aria-checked", "false");
   await expect(shareMainCard.getByTestId("persona-share-export")).toHaveCount(
     0,
   );
   await waitForAnimations(page);
   const shareMainCardBox = await shareMainCard.boundingBox();
   const exportAgentRowBox = await exportAgentRow.boundingBox();
-  const catalogSectionBox = await catalogSection.boundingBox();
   const shareCardGap =
-    (catalogSectionBox?.y ?? 0) -
+    (exportAgentRowBox?.y ?? 0) -
     ((shareMainCardBox?.y ?? 0) + (shareMainCardBox?.height ?? 0));
   expect(shareCardGap).toBeGreaterThanOrEqual(12);
   expect(shareCardGap).toBeLessThan(16);
@@ -949,7 +938,7 @@ test("custom personas share with people and keep export separate", async ({
   expect(exportAgentRowShadow).not.toBe("none");
   await expect(exportAgentRow).toHaveCSS("position", "relative");
   expect(exportAgentRowBox?.y ?? 0).toBeGreaterThanOrEqual(
-    (catalogSectionBox?.y ?? 0) + (catalogSectionBox?.height ?? 0) + 12,
+    (shareMainCardBox?.y ?? 0) + (shareMainCardBox?.height ?? 0) + 12,
   );
   await expect(page.getByTestId("agent-snapshot-export-dialog")).toHaveCount(0);
 
@@ -1329,9 +1318,34 @@ This deliberately long fenced-code example must not establish the minimum width
   await page.getByLabel("Open actions for Catalog Analyst").click();
   await page.getByRole("menuitem", { name: "Share" }).click();
   const catalogToggle = page.getByTestId("persona-share-show-in-catalog");
+  const shareDialog = page.getByTestId("persona-share-dialog");
+  const shareMainCard = shareDialog.getByTestId("persona-share-main-card");
+  const copyLinkButton = shareDialog.getByTestId("persona-share-copy-link");
+  const catalogSection = shareDialog.getByTestId("persona-share-catalog");
   const publishCatalogUpdatesButton = page.getByTestId(
     "persona-share-publish-catalog-updates",
   );
+  await expect(
+    shareMainCard.getByTestId("persona-share-catalog"),
+  ).toBeVisible();
+  await expect(catalogSection).toContainText("Share to catalog");
+  await expect(catalogSection).toContainText(
+    "Let anyone in this community find and use a copy of this agent.",
+  );
+  const [copyLinkButtonBox, catalogSectionBox, shareMainCardBox] =
+    await Promise.all([
+      copyLinkButton.boundingBox(),
+      catalogSection.boundingBox(),
+      shareMainCard.boundingBox(),
+    ]);
+  expect(catalogSectionBox?.y ?? 0).toBeGreaterThan(
+    (copyLinkButtonBox?.y ?? 0) + (copyLinkButtonBox?.height ?? 0),
+  );
+  expect(
+    (catalogSectionBox?.y ?? 0) + (catalogSectionBox?.height ?? 0),
+  ).toBeLessThanOrEqual(
+    (shareMainCardBox?.y ?? 0) + (shareMainCardBox?.height ?? 0),
+  );
   await expect(catalogToggle).toHaveAttribute("aria-checked", "false");
   await expect(publishCatalogUpdatesButton).toHaveCount(0);
   await catalogToggle.click();