From de08c15462b3b13dba5e29d1ab05438daf98f1fb Mon Sep 17 00:00:00 2001
From: Benjamin Shafii <benjamin.shafii@gmail.com>
Date: Fri, 8 May 2026 20:20:00 -0700
Subject: [PATCH] fix(app): preserve selected Den organization

---
 apps/app/src/app/lib/den.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/app/src/app/lib/den.ts b/apps/app/src/app/lib/den.ts
index a5772d6a3..2a4764db4 100644
--- a/apps/app/src/app/lib/den.ts
+++ b/apps/app/src/app/lib/den.ts
@@ -646,7 +646,11 @@ export async function ensureDenActiveOrganization(options?: { forceServerSync?:
   });
 
   const response = await client.listOrgs();
+  const selectedOrgId = settings.activeOrgId?.trim() ?? "";
+  const selectedOrgSlug = settings.activeOrgSlug?.trim() ?? "";
   const targetOrg =
+    response.orgs.find((org) => org.id === selectedOrgId) ??
+    response.orgs.find((org) => org.slug === selectedOrgSlug) ??
     response.orgs.find((org) => org.id === response.activeOrgId) ??
     response.orgs.find((org) => org.slug === response.activeOrgSlug) ??
     response.orgs[0] ??