diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index fe8e9e105..d5e83ecb2 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -26,14 +26,14 @@ export default (data) => {
 }
 
 export const suggestEmoji = (emojis) => (input, nameKeywordLocalizer) => {
-  const noPrefix = input.toLowerCase().substr(1)
+  const noPrefix = input.toLowerCase().substring(1)
   return emojis
     .map((emoji) => ({ ...emoji, ...nameKeywordLocalizer(emoji) }))
     .filter(
       (emoji) =>
         emoji.names
           .concat(emoji.keywords)
-          .filter((kw) => kw.toLowerCase().match(noPrefix)).length,
+          .filter((kw) => kw.toLowerCase().includes(noPrefix)).length,
     )
     .map((k) => {
       let score = 0