diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 372c8f69bc8..ad2e703b8eb 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -196,9 +196,10 @@ export default Ember.Component.extend({
       $results.empty().hide();
       $list.show();
     } else {
+      const lowerCaseFilter = this.get("filter").toLowerCase();
       const filterableEmojis = emojis.concat(_.keys(extendedEmojiList()));
       const filteredCodes = _.filter(filterableEmojis, code => {
-        return code.indexOf(this.get("filter")) > -1;
+        return code.indexOf(lowerCaseFilter) > -1;
       }).slice(0, 30);
       $results.empty().html(
         _.map(filteredCodes, (code) => {