diff --git a/src/components/form/SimpleSelect.js b/src/components/form/SimpleSelect.js
index 57bb42ee..17efd310 100644
--- a/src/components/form/SimpleSelect.js
+++ b/src/components/form/SimpleSelect.js
@@ -303,7 +303,7 @@ const SimpleSelect = withTheme(
     }, [ref, ref.current]);
 
     useEffect(() => {
-      if (inputValue && !searchInputValue) {
+      if (inputValue && !selectedOptions) {
         onSearchClick();
       }
     }, [menuIsVisible]);
@@ -386,6 +386,7 @@ const SimpleSelect = withTheme(
     };
 
     const addInputMethodology = () => {
+      setSelectedOptions(null)
       setInputValue(true);
     };