diff --git a/package.json b/package.json
index daadc6c..040b25b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@brightscout/mattermost-ui-library",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "author": {
     "name": "Brightscout, Inc."
   },
diff --git a/src/components/Input/Input.component.tsx b/src/components/Input/Input.component.tsx
index 4671c79..c99f64c 100644
--- a/src/components/Input/Input.component.tsx
+++ b/src/components/Input/Input.component.tsx
@@ -102,7 +102,7 @@ export const Input = forwardRef<HTMLInputElement, InputProps>((props, ref) => {
 					<StyledIconButton onClick={onClose}>
 						<Icon
 							name='Close'
-							size={12}
+							size={14}
 							iconColor='#ffffff'
 						/>
 					</StyledIconButton>
diff --git a/src/components/Input/Input.styles.ts b/src/components/Input/Input.styles.ts
index ef1aab1..6748910 100644
--- a/src/components/Input/Input.styles.ts
+++ b/src/components/Input/Input.styles.ts
@@ -150,7 +150,7 @@ export const StyledInput = styled(Form.Control)(({error}) => ({
 // Style for close icon button
 export const StyledIconButton = styled(Button)({
     borderRadius: '50%',
-    padding: 2,
+    padding: 0,
     borderWidth: 0,
 
     '&.btn.btn-primary': {
@@ -158,4 +158,8 @@ export const StyledIconButton = styled(Button)({
             background: colors.centerChannel_64,
         },
     },
+
+    '& svg': {
+        padding: 1,
+    },
 });
diff --git a/src/components/MMSearch/MMSearch.component.tsx b/src/components/MMSearch/MMSearch.component.tsx
index 8e6adee..2b0b19d 100644
--- a/src/components/MMSearch/MMSearch.component.tsx
+++ b/src/components/MMSearch/MMSearch.component.tsx
@@ -76,7 +76,8 @@ export const MMSearch = (props: MMSearchProps) => {
      * On clicking anywhere other than `input field`, the dropdown closes
      */
     const onDropDownCloseHandler = (e: MouseEvent) => {
-        if (e.target !== inputRef.current) {
+        e.stopPropagation();
+        if (e.target instanceof HTMLElement && !inputRef.current?.contains(e.target) && e.target !== inputRef.current) {
             setOpen(false);
         }
     };