diff --git a/packages/popover/src/index.tsx b/packages/popover/src/index.tsx index ab8d687fd..cde4e0a24 100644 --- a/packages/popover/src/index.tsx +++ b/packages/popover/src/index.tsx @@ -239,7 +239,11 @@ function useSimulateTabNavigationForReactTree< elements && triggerRef.current ? elements.indexOf(triggerRef.current) : -1; - return elements && elements[targetIndex + 1]; + const elementAfterTrigger = elements && elements[targetIndex + 1]; + return popoverRef.current && + popoverRef.current.contains(elementAfterTrigger || null) + ? false + : elementAfterTrigger; } function tabbedFromTriggerToPopover() {