diff --git a/src/components/TextInput/TextInput.react.js b/src/components/TextInput/TextInput.react.js
index 38149edf12..6ab9df19a5 100644
--- a/src/components/TextInput/TextInput.react.js
+++ b/src/components/TextInput/TextInput.react.js
@@ -15,6 +15,7 @@ class TextInput extends React.Component {
     if (props.multiline !== this.props.multiline) {
       const node = props.forwardedRef.current;
       node.focus();
+      if (this.props.value) node.setSelectionRange(this.props.value.length, this.props.value.length);
     }
   }