diff --git a/CHANGES.md b/CHANGES.md
index 83d53b75a7..fe93df3a62 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Improvements 🙌:
 
 Bugfix 🐛:
  - Double bottomsheet effect after verify with passphrase
+ - EditText cursor jumps to the start while typing fast (#2469)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
index 12538d314a..eb8945d29c 100644
--- a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
@@ -67,6 +67,8 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
         // Update only if text is different and value is not null
         if (value != null && holder.textInputEditText.text.toString() != value) {
             holder.textInputEditText.setText(value)
+            // To fix jumping cursor to the start https://github.com/airbnb/epoxy/issues/426
+            holder.textInputEditText.setSelection(value?.length ?: 0)
         }
         holder.textInputEditText.isEnabled = enabled
         inputType?.let { holder.textInputEditText.inputType = it }