diff --git a/packages/clay-multi-select/src/index.tsx b/packages/clay-multi-select/src/index.tsx index 8e174c05ef..f0f1d342d6 100644 --- a/packages/clay-multi-select/src/index.tsx +++ b/packages/clay-multi-select/src/index.tsx @@ -377,11 +377,18 @@ const ClayMultiSelect = React.forwardRef>( onChange={setValue} onFocus={ MenuRenderer && sourceItems - ? () => + ? ( + event: React.FocusEvent + ) => { + if (otherProps.onFocus) { + otherProps.onFocus(event); + } + setActive( !!value && sourceItems.length !== 0 - ) - : undefined + ); + } + : otherProps.onFocus } onFocusChange={setIsFocused} onItemsChange={hasAsyncItems ? () => {} : undefined}