diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
index 7fce40647c3f..3210e860798d 100755
--- a/src/components/OptionsSelector/BaseOptionsSelector.js
+++ b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -206,12 +206,13 @@ class BaseOptionsSelector extends Component {
      */
     selectRow(option, ref) {
         if (this.props.shouldFocusOnSelectRow) {
-            // Input is permanently focused on native platforms, so we always highlight the text inside of it
-            setSelection(this.textInput, 0, this.props.value.length);
             if (this.relatedTarget && ref === this.relatedTarget) {
                 this.textInput.focus();
+                this.relatedTarget = null;
+            }
+            if (this.textInput.isFocused()) {
+                setSelection(this.textInput, 0, this.props.value.length);
             }
-            this.relatedTarget = null;
         }
         this.props.onSelectRow(option);