From fe7ddfe1f7233c86719575670941b4213a33e538 Mon Sep 17 00:00:00 2001
From: Denis Yakshov <feerzlay@gmail.com>
Date: Mon, 28 Sep 2026 12:23:37 +0300
Subject: [PATCH] fix(react,MenuList): add check for nested overlay scrollbars

---
 packages/react/src/components/Menu/MenuList/MenuList.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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<HTMLUListElement, MenuListProps>(function Men
   );
 
   const handleKeyDown = (event: KeyboardEvent<HTMLUListElement>) => {
-    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') {