diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/EmojiSearchTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/EmojiSearchTable.kt
index be2a28bc96..33b5802939 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/EmojiSearchTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/EmojiSearchTable.kt
@@ -62,7 +62,7 @@ class EmojiSearchTable(context: Context, databaseHelper: SignalDatabase) : Datab
     readableDatabase
       .select(LABEL, EMOJI, RANK)
       .from(TABLE_NAME)
-      .where("$LABEL LIKE ?", "%$query%")
+      .where("$LABEL LIKE ? OR $EMOJI = ?", "%$query%", query)
       .orderBy("$RANK ASC")
       .limit(limit)
       .run()
@@ -123,7 +123,7 @@ class EmojiSearchTable(context: Context, databaseHelper: SignalDatabase) : Datab
   private fun similarityScore(searchTerm: String, entry: Entry, maxRank: Int): Float {
     val match: String = entry.label
 
-    if (searchTerm == match) {
+    if (searchTerm == entry.emoji || searchTerm == match) {
       return entry.scaledRank(maxRank)
     }