diff --git a/static/js/composebox_typeahead.js b/static/js/composebox_typeahead.js
index 0750d77b21..7b337fc26e 100644
--- a/static/js/composebox_typeahead.js
+++ b/static/js/composebox_typeahead.js
@@ -72,8 +72,9 @@ function query_matches_person(query, person) {
 
 }
 
+// Case-insensitive
 function query_matches_emoji(query, emoji) {
-    return (emoji.emoji_name.indexOf(query.toLowerCase()) !== -1);
+    return (emoji.emoji_name.toLowerCase().indexOf(query.toLowerCase()) !== -1);
 }
 
 // nextFocus is set on a keydown event to indicate where we should focus on keyup.