diff --git a/src/Select.js b/src/Select.js index c489a360d7..f35c8cd585 100644 --- a/src/Select.js +++ b/src/Select.js @@ -480,7 +480,7 @@ export default class Select extends Component { blur = this.blurInput; openMenu(focusOption: 'first' | 'last') { - const { menuOptions, selectValue } = this.state; + const { menuOptions, selectValue, isFocused } = this.state; const { isMulti } = this.props; let openAtIndex = focusOption === 'first' ? 0 : menuOptions.focusable.length - 1; @@ -492,7 +492,8 @@ export default class Select extends Component { } } - this.scrollToFocusedOptionOnUpdate = true; + // only scroll if the menu isn't already open + this.scrollToFocusedOptionOnUpdate = !(isFocused && this.menuListRef); this.inputIsHiddenAfterUpdate = false; this.onMenuOpen();