diff --git a/app/containers/MessageBox/index.js b/app/containers/MessageBox/index.js
index 39e29dbc..7ca8db2c 100644
--- a/app/containers/MessageBox/index.js
+++ b/app/containers/MessageBox/index.js
@@ -487,10 +487,20 @@ class MessageBox extends Component {
 	}
 
 	setInput = (text) => {
-		this.text = text;
 		if (this.component && this.component.setNativeProps) {
-			this.component.setNativeProps({ text });
+			const props = { text };
+
+			if (isAndroid) {
+				const diff = text.length - this.text?.length;
+				const selection = this.component?.lastNativeSelection;
+				const start = selection?.start + diff >= 0 ? selection?.start + diff : text.length;
+				const end = selection?.end + diff >= 0 ? selection?.start + diff : text.length;
+				props.selection = { start, end };
+			}
+
+			this.component.setNativeProps(props);
 		}
+		this.text = text;
 	}
 
 	setShowSend = (showSend) => {