diff --git a/src/modules/Dropdown/Dropdown.js b/src/modules/Dropdown/Dropdown.js index ff4530ec75..eebdc73eb9 100644 --- a/src/modules/Dropdown/Dropdown.js +++ b/src/modules/Dropdown/Dropdown.js @@ -404,10 +404,15 @@ export default class Dropdown extends Component { handleMouseDown = (e) => { debug('handleMouseDown()') + const { open } = this.state this.isMouseDown = true _.invoke(this.props, 'onMouseDown', e, this.props) document.addEventListener('mouseup', this.handleDocumentMouseUp) + + if (open) { + _.invoke(this.ref.current, 'focus') + } } handleDocumentMouseUp = () => {