diff --git a/lib/components/common/CustomMappingDropdown.tsx b/lib/components/common/CustomMappingDropdown.tsx
index 20fe0c0..b174966 100644
--- a/lib/components/common/CustomMappingDropdown.tsx
+++ b/lib/components/common/CustomMappingDropdown.tsx
@@ -315,6 +315,7 @@ export default function CustomEntitiesDropdown({
             setSelectedOptions(updatedSelectedOptions);
         } else {
             setSelectedOptions([...selectedOptions, option]);
+            setAnchorEl(null);
         }
         onSelection(option, !isOptionAlreadySelected)
     };
@@ -333,6 +334,7 @@ export default function CustomEntitiesDropdown({
             if(isCustomDictionaryValid(customDictionaryFieldOption, headerIndexes)){
                 customDictionaryFieldOption.label = getAbbreviationFromOption(customDictionaryFieldOption, headerIndexes)
                 onCustomDictionaryFieldCreation(customDictionaryFieldOption, true);
+                setAnchorEl(null);
             }else{
                 setErrorMessage("Missing at least one mandatory property (title or abbreviation) ")
             }