diff --git a/src/components/combo_box/combo_box.js b/src/components/combo_box/combo_box.js
index 26047399d590..34be9f858281 100644
--- a/src/components/combo_box/combo_box.js
+++ b/src/components/combo_box/combo_box.js
@@ -346,11 +346,14 @@ export class EuiComboBox extends Component {
   onAddOption = (addedOption) => {
     const { onChange, selectedOptions, singleSelection } = this.props;
     onChange(singleSelection ? [addedOption] : selectedOptions.concat(addedOption));
+
+    this.clearSearchValue();
+
     if (singleSelection) {
       this.closeList();
       return;
     }
-    this.clearSearchValue();
+
     this.focusSearchInput();
   };