diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index cc29852ac49..341767818d4 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -188,7 +188,7 @@ export default Ember.Component.extend({
       $list.show();
     } else {
       const regexp = new RegExp(this.get("filter"), "g");
-      const filteredCodes = _.filter(emojis, code => regexp.test(code)).slice(0, 30);
+      const filteredCodes = _.filter(emojis.concat(_.keys(extendedEmojiList())), code => regexp.test(code)).slice(0, 30);
       $results.empty().html(
         _.map(filteredCodes, (code) => {
           const hasDiversity = isSkinTonableEmoji(code);