diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index d5aaaa1128..90bf14f5af 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -314,7 +314,7 @@ module.exports = React.createClass({
             return;
         }
 
-        var isEmote = /^\/me /i.test(contentText);
+        var isEmote = /^\/me( |$)/i.test(contentText);
         var sendMessagePromise;
 
         if (isEmote) {