diff --git a/src/cheogram/java/com/cheogram/android/EmojiSearch.java b/src/cheogram/java/com/cheogram/android/EmojiSearch.java
index c94422688b1c4fe0a31bdec23c476bad198290fb..d308166a87ea5fd9c02d7e0168b8d299b8c57d1c 100644
--- a/src/cheogram/java/com/cheogram/android/EmojiSearch.java
+++ b/src/cheogram/java/com/cheogram/android/EmojiSearch.java
@@ -77,7 +77,7 @@ public class EmojiSearch {
 	public synchronized List<Emoji> find(final String q) {
 		final ResultPQ pq = new ResultPQ();
 		for (Emoji e : emoji) {
-			if (e.emoticonMatch(q)) {
+			if (e.emoticonMatch(q) || e.uniquePart().equals(q)) {
 				pq.addTopK(e, 999999, 10);
 			}
 			int shortcodeScore = e.shortcodes.isEmpty() ? 0 : Collections.max(Lists.transform(e.shortcodes, (shortcode) -> FuzzySearch.ratio(q, shortcode)));