diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/mention/MentionViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/mention/MentionViewModel.kt
index e3e5df0458..ab97675f33 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/mention/MentionViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/mention/MentionViewModel.kt
@@ -217,7 +217,7 @@ class MentionViewModel(
 
         // Add the remaining content
         sb.append(editable, offset, editable.length)
-        return sb.toString()
+        return sb.toString().trim()
     }
 
     data class Member(