diff --git a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dart b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dart
index 0dd084697830b..7764d73838671 100644
--- a/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dart
+++ b/frontend/appflowy_flutter/lib/shared/icon_emoji_picker/icon.dart
@@ -35,9 +35,12 @@ class IconGroup {
   String get displayName => name.replaceAll('_', ' ');
 
   IconGroup filter(String keyword) {
+    final lowercaseKey = keyword.toLowerCase();
     final filteredIcons = icons
         .where(
-          (icon) => icon.keywords.any((k) => k.contains(keyword.toLowerCase())),
+          (icon) =>
+              icon.keywords.any((k) => k.contains(lowercaseKey)) ||
+              icon.name.contains(lowercaseKey),
         )
         .toList();
     return IconGroup(name: name, icons: filteredIcons);
diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lock
index 120a4b3e07228..0cb05a932037f 100644
--- a/frontend/appflowy_flutter/pubspec.lock
+++ b/frontend/appflowy_flutter/pubspec.lock
@@ -757,8 +757,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "38c2c42"
-      resolved-ref: "38c2c429212af6b72a0af829bb0dd3f3eb4ce2c7"
+      ref: "8a9fa49"
+      resolved-ref: "8a9fa491cb3b86baf78b0a33c2c37a29d1cae028"
       url: "https://github.com/LucasXu0/emoji_mart.git"
     source: git
     version: "1.0.2"
diff --git a/frontend/appflowy_flutter/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yaml
index 3a4301e6b0d59..7afa01c4ae239 100644
--- a/frontend/appflowy_flutter/pubspec.yaml
+++ b/frontend/appflowy_flutter/pubspec.yaml
@@ -73,7 +73,7 @@ dependencies:
   flutter_emoji_mart:
     git:
       url: https://github.com/LucasXu0/emoji_mart.git
-      ref: "38c2c42"
+      ref: "8a9fa49"
   flutter_math_fork: ^0.7.3
   flutter_slidable: ^3.0.0