From 91fcc127db0c5895ab05daacdaa239e0aa41a191 Mon Sep 17 00:00:00 2001
From: alexandru-morariu-lgp
 <84004128+alexandrumorariu@users.noreply.github.com>
Date: Wed, 5 Aug 2026 16:43:12 +0300
Subject: [PATCH] Fix for panels bug

---
 internal/Panels/useFocusOnTransition.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/internal/Panels/useFocusOnTransition.js b/internal/Panels/useFocusOnTransition.js
index 03c22e0c3..fb77014e6 100644
--- a/internal/Panels/useFocusOnTransition.js
+++ b/internal/Panels/useFocusOnTransition.js
@@ -10,7 +10,12 @@ const transitionHandlers = {
 			current.timerId = setTimeout(() => {
 				const currentSpotlight = Spotlight.getCurrent();
 				if (spotlightId && !currentSpotlight) {
-					Spotlight.focus(spotlightId);
+					const node = document.querySelector(`[data-spotlight-id=${spotlightId}]`);
+					const activeContainerNode = document.querySelector(`[data-spotlight-id=${Spotlight.getActiveContainer()}]`);
+
+					if (!node || !activeContainerNode || node.contains(activeContainerNode) || activeContainerNode.contains(node)) {
+						Spotlight.focus(spotlightId);
+					}
 				}
 			}, 40);
 		}