diff --git a/packages/react/src/components/Menu/MenuList/MenuList.tsx b/packages/react/src/components/Menu/MenuList/MenuList.tsx index c26631f61..3f0b6e60f 100644 --- a/packages/react/src/components/Menu/MenuList/MenuList.tsx +++ b/packages/react/src/components/Menu/MenuList/MenuList.tsx @@ -178,15 +178,18 @@ export const MenuList = forwardRef(function Men ); const handleKeyDown = (event: KeyboardEvent) => { - const list = listRef.current; const key = event.key; const isModifierKeyPressed = event.ctrlKey || event.metaKey || event.altKey; + let list = listRef.current; + if (!list || isModifierKeyPressed) { onKeyDown?.(event); return; } + list = list.querySelector('[data-overlayscrollbars-viewport]') || list; + const currentFocus = getActiveElement(ownerDocument(list)); if (key === 'ArrowDown') {