diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 7d40bc3cc9..06a428ffff 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -75,7 +75,7 @@ const PostStatusForm = {
       const firstchar = this.textAtCaret.charAt(0)
       if (firstchar === '@') {
         const matchedUsers = filter(this.users, (user) => (String(user.name + user.screen_name)).toUpperCase()
-            .match(this.textAtCaret.slice(1).toUpperCase()))
+            .startsWith(this.textAtCaret.slice(1).toUpperCase()))
         if (matchedUsers.length <= 0) {
           return false
         }
@@ -89,7 +89,7 @@ const PostStatusForm = {
         }))
       } else if (firstchar === ':') {
         if (this.textAtCaret === ':') { return }
-        const matchedEmoji = filter(this.emoji.concat(this.customEmoji), (emoji) => emoji.shortcode.match(this.textAtCaret.slice(1)))
+        const matchedEmoji = filter(this.emoji.concat(this.customEmoji), (emoji) => emoji.shortcode.startsWith(this.textAtCaret.slice(1)))
         if (matchedEmoji.length <= 0) {
           return false
         }