diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index ec1fd3d276..4d746448ef 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -306,7 +306,11 @@ export default class BasicMessageEditor extends React.Component {
             const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
             const range = model.startRange(position);
             range.expandBackwardsWhile((index, offset, part) => {
-                return part.text[offset] !== " " && (part.type === "plain" || part.type === "pill-candidate");
+                return part.text[offset] !== " " && (
+                    part.type === "plain" ||
+                    part.type === "pill-candidate" ||
+                    part.type === "command"
+                );
             });
             const {partCreator} = model;
             // await for auto-complete to be open