From 0d8e64112fbf3b9ee0d4ec361e2cce197ee2d52e Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Fri, 11 Sep 2026 21:42:47 -0500
Subject: [PATCH] fix(tui): defer named-theme palette detection (#48570)

---
 packages/tui/src/context/theme.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/tui/src/context/theme.tsx b/packages/tui/src/context/theme.tsx
index 23cd3055f51..a8c9984f08c 100644
--- a/packages/tui/src/context/theme.tsx
+++ b/packages/tui/src/context/theme.tsx
@@ -184,7 +184,11 @@ const themeContext = createSimpleContext({
     }
 
     onMount(() => {
-      void Promise.allSettled([resolveSystemTheme(store.mode), syncCustomThemes()]).finally(() => {
+      const systemTheme = resolveSystemTheme(store.mode)
+      void Promise.allSettled([
+        store.active === "system" ? systemTheme : Promise.resolve(),
+        syncCustomThemes(),
+      ]).finally(() => {
         valuesV2()
         setStore("ready", true)
       })