diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
index a7fc72d2d4..6a3ca0f1c0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
@@ -808,15 +808,14 @@ class MessageComposerFragment : VectorBaseFragment<FragmentComposerBinding>(), A
                 )
                 append(if (startToCompose) ": " else " ")
             }
-            if (startToCompose) {
-                if (displayName.startsWith("/")) {
-                    // Ensure displayName will not be interpreted as a Slash command
-                    composer.editText.append("\\")
-                }
-                composer.editText.append(pill)
-            } else {
-                composer.editText.text?.insert(composer.editText.selectionStart, pill)
+            if (startToCompose && displayName.startsWith("/")) {
+                // Ensure displayName will not be interpreted as a Slash command
+                composer.editText.append("\\")
             }
+            // Always use EditText.getText().insert for adding pills as TextView.append doesn't appear
+            // to upgrade to BufferType.Spannable as hinted at in the docs:
+            // https://developer.android.com/reference/android/widget/TextView#append(java.lang.CharSequence)
+            composer.editText.text.insert(composer.editText.selectionStart, pill)
         }
         focusComposerAndShowKeyboard()
     }