diff --git a/elm/Main.elm b/elm/Main.elm
index 8f2477b..3d645e6 100644
--- a/elm/Main.elm
+++ b/elm/Main.elm
@@ -60,7 +60,7 @@ modelEmojis model =
         Search s ->
             Emoji.categories
                 |> List.map Emoji.getEmojis
-                |> List.map (List.filter (\x -> String.contains s x.name))
+                |> List.map (List.filter (\x -> String.contains s x.name || List.any (String.contains s) x.tags))
                 |> doubleMap (\x -> ( x, distance s x.name ))
                 |> List.map (List.sortBy Tuple.second)
                 |> mergeBy Tuple.second