diff --git a/src/components/RoomNameInput.js b/src/components/RoomNameInput.js
index 5d1042be3ebd..c9ba86fbae4d 100644
--- a/src/components/RoomNameInput.js
+++ b/src/components/RoomNameInput.js
@@ -70,6 +70,7 @@ class RoomNameInput extends Component {
         this.originalRoomName = props.initialValue;
 
         this.checkAndModifyRoomName = this.checkAndModifyRoomName.bind(this);
+        this.checkExistingRoomName = this.checkExistingRoomName.bind(this);
     }
 
     componentDidUpdate(prevProps, prevState) {
@@ -83,7 +84,7 @@ class RoomNameInput extends Component {
 
         // If the selected policyID has changed we need to check if the room name already exists on this new policy.
         if (prevProps.policyID !== this.props.policyID) {
-            this.checkAndModifyRoomName(this.state.roomName);
+            this.checkExistingRoomName(this.state.roomName);
         }
     }
 
@@ -93,41 +94,64 @@ class RoomNameInput extends Component {
      * - Cannot not include space or special characters, and we automatically apply an underscore for spaces
      * - Must be lowercase
      * Also checks to see if this room name already exists, and displays an error message if so.
-     * @param {String} roomName
+     * @param {Event} event
      *
      */
-    checkAndModifyRoomName(roomName) {
-        const modifiedRoomNameWithoutHash = roomName.substring(1)
+    checkAndModifyRoomName(event) {
+        const nativeEvent = event.nativeEvent;
+        const roomName = nativeEvent.text;
+        const target = nativeEvent.target;
+        const selection = target.selectionStart;
+
+        const modifiedRoomNameWithoutHash = roomName
             .replace(/ /g, '_')
             .replace(/[^a-zA-Z\d_]/g, '')
             .substring(0, CONST.REPORT.MAX_ROOM_NAME_LENGTH)
             .toLowerCase();
         const finalRoomName = `#${modifiedRoomNameWithoutHash}`;
 
+        this.checkExistingRoomName(finalRoomName);
+
+        this.setState({
+            roomName: finalRoomName,
+        }, () => {
+            if (!selection) {
+                return;
+            }
+            target.selectionEnd = selection;
+        });
+    }
+
+    /**
+     * Checks to see if this room name already exists, and displays an error message if so.
+     * @param {String} roomName
+     *
+     */
+    checkExistingRoomName(roomName) {
         const isExistingRoomName = _.some(
             _.values(this.props.reports),
-            report => report && report.policyID === this.props.policyID && report.reportName === finalRoomName,
+            report => report && report.policyID === this.props.policyID && report.reportName === roomName,
         );
 
         let error = '';
 
         // We error if the room name already exists. We don't care if it matches the original name provided in this
         // component because then we are not changing the room's name.
-        if (isExistingRoomName && finalRoomName !== this.originalRoomName) {
+        if (isExistingRoomName && roomName !== this.originalRoomName) {
             error = this.props.translate('newRoomPage.roomAlreadyExistsError');
         }
 
         // Certain names are reserved for default rooms and should not be used for policy rooms.
-        if (_.contains(CONST.REPORT.RESERVED_ROOM_NAMES, finalRoomName)) {
+        if (_.contains(CONST.REPORT.RESERVED_ROOM_NAMES, roomName)) {
             error = this.props.translate('newRoomPage.roomNameReservedError');
         }
 
         this.setState({
-            roomName: finalRoomName,
             error,
         });
     }
 
+
     render() {
         return (
             <TextInputWithPrefix
@@ -136,7 +160,7 @@ class RoomNameInput extends Component {
                 prefixCharacter="#"
                 placeholder={this.props.translate('newRoomPage.social')}
                 containerStyles={[styles.mb5]}
-                onChangeText={roomName => this.checkAndModifyRoomName(roomName)}
+                onChange={this.checkAndModifyRoomName}
                 value={this.state.roomName.substring(1)}
                 errorText={this.state.error}
                 autoCapitalize="none"
diff --git a/src/components/TextInputWithPrefix/index.android.js b/src/components/TextInputWithPrefix/index.android.js
index 8c1854e1badd..e9b3944289fc 100644
--- a/src/components/TextInputWithPrefix/index.android.js
+++ b/src/components/TextInputWithPrefix/index.android.js
@@ -17,14 +17,11 @@ const propTypes = {
     /** Whether to disable the field and style */
     disabled: PropTypes.bool,
 
-    /** Callback to execute the text input is modified */
-    onChangeText: PropTypes.func,
 };
 
 const defaultProps = {
     errorText: '',
     disabled: false,
-    onChangeText: () => {},
 };
 
 const TextInputWithPrefix = props => (
@@ -44,9 +41,8 @@ const TextInputWithPrefix = props => (
                     styles.noOutline,
                     {height: 40},
                 ]}
-                onChangeText={text => props.onChangeText(`${props.prefixCharacter}${text}`)}
                 // eslint-disable-next-line react/jsx-props-no-spreading
-                {..._.omit(props, ['prefixCharacter', 'errorText', 'onChangeText'])}
+                {..._.omit(props, ['prefixCharacter', 'errorText'])}
             />
         </View>
         {!_.isEmpty(props.errorText) && (
diff --git a/src/components/TextInputWithPrefix/index.js b/src/components/TextInputWithPrefix/index.js
index 6080b08870c4..8802f88536e2 100644
--- a/src/components/TextInputWithPrefix/index.js
+++ b/src/components/TextInputWithPrefix/index.js
@@ -17,14 +17,11 @@ const propTypes = {
     /** Whether to disable the field and style */
     disabled: PropTypes.bool,
 
-    /** Callback to execute the text input is modified */
-    onChangeText: PropTypes.func,
 };
 
 const defaultProps = {
     errorText: '',
     disabled: false,
-    onChangeText: () => {},
 };
 
 const TextInputWithPrefix = props => (
@@ -42,9 +39,8 @@ const TextInputWithPrefix = props => (
                     styles.textInputWithPrefix.textInput,
                     styles.noOutline,
                 ]}
-                onChangeText={text => props.onChangeText(`${props.prefixCharacter}${text}`)}
                 // eslint-disable-next-line react/jsx-props-no-spreading
-                {..._.omit(props, ['prefixCharacter', 'errorText', 'onChangeText'])}
+                {..._.omit(props, ['prefixCharacter', 'errorText'])}
             />
         </View>
         {!_.isEmpty(props.errorText) && (