diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs b/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs
index ebef7f176536..6088c03e9d16 100644
--- a/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs
+++ b/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs
@@ -276,7 +276,13 @@ protected virtual void OnTextChanged(string oldValue, string newValue)
 		{
 			UpdateInlines(newValue);
 
-			Selection = new Range(0, 0);
+#if __SKIA__
+			if (TemplatedParent is not TextBox textBox || textBox.TextBoxView?.DisplayBlock != this)
+#endif
+			{
+				// On skia, we don't want to set the selection here in case TextBox is managing the selection.
+				Selection = new Range(0, 0);
+			}
 
 			OnTextChangedPartial();
 			InvalidateTextBlock();