diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 index 7aae809535b..15d52f21805 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 +++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/emoji.js.es6 @@ -7,6 +7,7 @@ let _unicodeRegexp; export function setUnicodeReplacements(replacements) { _unicodeReplacements = replacements; if (replacements) { + // We sort and reverse to match longer emoji sequences first _unicodeRegexp = new RegExp(Object.keys(replacements).sort().reverse().join("|"), "g"); } };