diff --git a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
index 633a669ec..2f85a7175 100644
--- a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
@@ -116,9 +116,12 @@ export const IconPicker = ({
         })
       : [];
 
+    const isSelectedIconMatchingFilter =
+      selectedIconKey && filteredIconKeys.includes(selectedIconKey);
+
     const uniqueFilteredIconKeys = [
       ...new Set(
-        selectedIconKey
+        selectedIconKey && isSelectedIconMatchingFilter
           ? [selectedIconKey, ...filteredIconKeys]
           : filteredIconKeys,
       ),