diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
index 460088a93d..17eeb1d48d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/AutoCompleter.kt
@@ -184,10 +184,13 @@ class AutoCompleter @AssistedInject constructor(
                         }
 
                         // Detect next word separator
+                        /*
                         var endIndex = editable.indexOf(" ", startIndex)
                         if (endIndex == -1) {
                             endIndex = editable.length
                         }
+                         */
+                        val endIndex = editText.selectionEnd
 
                         // Replace the word by its completion
                         editable.delete(startIndex, endIndex)
@@ -227,10 +230,13 @@ class AutoCompleter @AssistedInject constructor(
         }
 
         // Detect next word separator
+        /*
         var endIndex = editable.indexOfAny(listOf(" ", "\n"), startIndex)
         if (endIndex == -1) {
             endIndex = editable.length
         }
+         */
+        val endIndex = editText.selectionEnd
 
         // Replace the word by its completion
         val displayName = matrixItem.getBestName()