diff --git a/public/scripts/slash-commands/SlashCommandParser.js b/public/scripts/slash-commands/SlashCommandParser.js
index 171a38491..9b839ca23 100644
--- a/public/scripts/slash-commands/SlashCommandParser.js
+++ b/public/scripts/slash-commands/SlashCommandParser.js
@@ -109,7 +109,7 @@ export class SlashCommandParser {
         return this.text[this.index];
     }
     get endOfText() {
-        return this.index >= this.text.length || /^\s+$/.test(this.ahead);
+        return this.index >= this.text.length || (/\s/.test(this.char) && /^\s+$/.test(this.ahead));
     }