diff --git a/desktop/src/features/agents/ui/PersonaShareDialog.tsx b/desktop/src/features/agents/ui/PersonaShareDialog.tsx
index 65a561c96..1780f514a 100644
--- a/desktop/src/features/agents/ui/PersonaShareDialog.tsx
+++ b/desktop/src/features/agents/ui/PersonaShareDialog.tsx
@@ -623,7 +623,7 @@ export function SnapshotShareDialog({
                   value={linkShareLevel}
                 />
               </div>
-              {afterLink}
+              {afterLink ? <div className="mt-2">{afterLink}</div> : null}
               <Separator
                 className="my-4 bg-input/40"
                 data-testid={`${testIdPrefix}-link-divider`}
diff --git a/desktop/src/features/agents/ui/usePersonaActions.ts b/desktop/src/features/agents/ui/usePersonaActions.ts
index 8b26d8bb2..1d20e9f48 100644
--- a/desktop/src/features/agents/ui/usePersonaActions.ts
+++ b/desktop/src/features/agents/ui/usePersonaActions.ts
@@ -117,8 +117,13 @@ export function usePersonaActions() {
 
   const personas = personasQuery.data ?? [];
   const sharedCatalogPersonaIdSet = React.useMemo(
-    () => new Set(sharedCatalogPersonaIds),
-    [sharedCatalogPersonaIds],
+    () =>
+      new Set(
+        sharedCatalogPersonaIds.filter(
+          (personaId) => catalogPersonaMemoryLevels[personaId] !== undefined,
+        ),
+      ),
+    [catalogPersonaMemoryLevels, sharedCatalogPersonaIds],
   );
   const availableRuntimes = React.useMemo(
     () =>
diff --git a/desktop/tests/e2e/agents.spec.ts b/desktop/tests/e2e/agents.spec.ts
index eeb647b18..9ff6bd296 100644
--- a/desktop/tests/e2e/agents.spec.ts
+++ b/desktop/tests/e2e/agents.spec.ts
@@ -846,7 +846,7 @@ test("custom personas share with people and keep export separate", async ({
     (catalogSectionBox?.y ?? 0) + (catalogSectionBox?.height ?? 0) + 23,
   );
   expect(catalogSectionBox?.y ?? 0).toBeGreaterThanOrEqual(
-    (linkRowBox?.y ?? 0) + (linkRowBox?.height ?? 0),
+    (linkRowBox?.y ?? 0) + (linkRowBox?.height ?? 0) + 7,
   );
   expect(
     Math.abs(
@@ -1272,6 +1272,12 @@ test("custom personas share with people and keep export separate", async ({
 
 test("custom personas can be shared to the relay catalog", async ({ page }) => {
   const personaId = "custom:catalog-analyst";
+  await page.addInitScript((legacyPersonaId) => {
+    localStorage.setItem(
+      "buzz-persona-catalog-visibility-v1",
+      JSON.stringify([legacyPersonaId]),
+    );
+  }, personaId);
   await installMockBridge(page, {
     globalAgentConfig: {
       env_vars: { ANTHROPIC_API_KEY: "sk-ant-test" },