diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
index c473c426d80f..88ed99284d48 100755
--- a/src/components/OptionsSelector/BaseOptionsSelector.js
+++ b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -101,7 +101,7 @@ class BaseOptionsSelector extends Component {
         }
 
         const newOptions = this.flattenSections();
-        const newFocusedIndex = this.props.selectedOptions.length;
+        const newFocusedIndex = this.props.shouldTextInputAppearBelowOptions ? newOptions.length : this.props.selectedOptions.length;
         // eslint-disable-next-line react/no-did-update-set-state
         this.setState({
             allOptions: newOptions,