diff --git a/ts/components/CompositionInput.tsx b/ts/components/CompositionInput.tsx
index cd584edb515..a524872676e 100644
--- a/ts/components/CompositionInput.tsx
+++ b/ts/components/CompositionInput.tsx
@@ -80,7 +80,7 @@ function getWordAtIndex(str: string, index: number) {
     .slice(0, index + 1)
     .replace(/\s+$/, '')
     .search(/\S+$/);
-  const end = str.slice(index).search(/(?:\s|$)/) + index;
+  const end = str.slice(index).search(/(?:[^a-z0-9-_+]|$)/) + index;
 
   return {
     start,