From a7444bf944c219b9eaba2f794847b3001237795f Mon Sep 17 00:00:00 2001
From: OpeOginni <107570612+OpeOginni@users.noreply.github.com>
Date: Tue, 25 Aug 2026 13:05:49 +0200
Subject: [PATCH] fix(ui): restore focus in stacked dialogs (#44928)

Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
---
 packages/ui/src/context/dialog.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/context/dialog.tsx b/packages/ui/src/context/dialog.tsx
index 39ef8ea1c73..c4020307952 100644
--- a/packages/ui/src/context/dialog.tsx
+++ b/packages/ui/src/context/dialog.tsx
@@ -88,10 +88,10 @@ function init() {
         setClosing = setClosingSignal
         return (
           <Kobalte
-            modal
+            modal={stack().at(-1)?.id === id}
             open={!closing()}
             onOpenChange={(open: boolean) => {
-              if (open) return
+              if (open || stack().at(-1)?.id !== id) return
               close(id)
             }}
           >