diff --git a/packages/web/src/components/search/CategorySearch.js b/packages/web/src/components/search/CategorySearch.js
index 612ea738a5..b55cecfe19 100644
--- a/packages/web/src/components/search/CategorySearch.js
+++ b/packages/web/src/components/search/CategorySearch.js
@@ -436,7 +436,6 @@ class CategorySearch extends Component {
 					{
 						currentValue: value || '',
 						currentCategory: category || null,
-						suggestions: [],
 					},
 					() => {
 						if (isDefaultValue) {
@@ -651,7 +650,7 @@ class CategorySearch extends Component {
 
 	handleStateChange = (changes) => {
 		const { isOpen, type } = changes;
-		if (type === Downshift.stateChangeTypes.mouseUp) {
+		if (type === Downshift.stateChangeTypes.mouseUp && isOpen !== undefined) {
 			this.setState({
 				isOpen,
 			});
diff --git a/packages/web/src/components/search/DataSearch.js b/packages/web/src/components/search/DataSearch.js
index 95e89b2e41..df3005e92e 100644
--- a/packages/web/src/components/search/DataSearch.js
+++ b/packages/web/src/components/search/DataSearch.js
@@ -358,7 +358,6 @@ class DataSearch extends Component {
 				this.setState(
 					{
 						currentValue: value,
-						suggestions: [],
 					},
 					() => {
 						if (isDefaultValue) {
@@ -566,7 +565,7 @@ class DataSearch extends Component {
 
 	handleStateChange = (changes) => {
 		const { isOpen, type } = changes;
-		if (type === Downshift.stateChangeTypes.mouseUp) {
+		if (type === Downshift.stateChangeTypes.mouseUp && isOpen !== undefined) {
 			this.setState({
 				isOpen,
 			});