diff --git a/src/components/Dropdown/Dropdown.tsx b/src/components/Dropdown/Dropdown.tsx index aee594a6d..dcb434119 100644 --- a/src/components/Dropdown/Dropdown.tsx +++ b/src/components/Dropdown/Dropdown.tsx @@ -375,8 +375,8 @@ const Dropdown = ({ } break; case 'ArrowDown': - if (focusedElement && focusedElement.id === `${name}-container`) { - const optionsContainer = focusedElement.children[1]; + if (focusedElement && focusedElement.id === `${name}-button-value`) { + const optionsContainer = focusedElement.nextElementSibling; if (optionsContainer) { const toFocus = optionsContainer.children[0] as HTMLElement | undefined; if (toFocus) { @@ -447,7 +447,6 @@ const Dropdown = ({ setIsOpen(true); }} ref={mergeRefs([containerRef, containerInternalRef])} - tabIndex={tabIndex} {...containerProps} >