diff --git a/src/design-system/components/chip/Chip.tsx b/src/design-system/components/chip/Chip.tsx
index 1ac1f0981..993c8f321 100644
--- a/src/design-system/components/chip/Chip.tsx
+++ b/src/design-system/components/chip/Chip.tsx
@@ -68,9 +68,9 @@ const ChipContent: React.FC<ChipContentProps> = ({
   endIcon
 }) => (
   <>
-    {startIcon && <span className='startIcon'>{startIcon}</span>}
+    {startIcon ? <span className='startIcon'>{startIcon}</span> : null}
     <span className='label'>{label}</span>
-    {endIcon && <span className='endIcon'>{endIcon}</span>}
+    {endIcon ? <span className='endIcon'>{endIcon}</span> : null}
   </>
 )
 
@@ -89,7 +89,7 @@ const FilterChip: React.FC<FilterChipProps> = ({
 
   const handleSelect = (option: string) => {
     setSelectedOption(option)
-    setIsOpen((prev) => !prev)
+    setIsOpen(false)
   }
 
   const isSelected = Boolean(selectedOption)
@@ -124,6 +124,7 @@ const FilterChip: React.FC<FilterChipProps> = ({
               onMouseDown={() => {
                 handleSelect(option)
               }}
+              role='button'
             >
               {option}
             </li>