diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
index 725abe3dae..e3c1fb5dd3 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
@@ -103,6 +103,9 @@ fun MarkdownTextInput(
                 }
                 addTextChangedListener { editable ->
                     onTyping(!editable.isNullOrEmpty())
+                    if (state.lineCount != lineCount) {
+                        post { bringPointIntoView(selectionStart) }
+                    }
                     state.text.update(editable, false)
                     state.lineCount = lineCount