diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23b132321ac..a9b0e2d8ab9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 **Bug fixes**
 
 - Fixed `EuiSwitch` clicking on disabled label ([#2575](https://github.com/elastic/eui/pull/2575))
+- Fixed `EuiComboBox` options list closing when clicking outside the component after scrolling ([#2589](https://github.com/elastic/eui/pull/2589))
 
 ## [`16.1.0`](https://github.com/elastic/eui/tree/v16.1.0)
 
diff --git a/src/components/combo_box/__snapshots__/combo_box.test.js.snap b/src/components/combo_box/__snapshots__/combo_box.test.js.snap
index f4afc129423..125cfbc0db9 100644
--- a/src/components/combo_box/__snapshots__/combo_box.test.js.snap
+++ b/src/components/combo_box/__snapshots__/combo_box.test.js.snap
@@ -466,6 +466,7 @@ exports[`props singleSelection selects existing option when opened 1`] = `
       onCloseList={[Function]}
       onOptionClick={[Function]}
       onOptionEnterKey={[Function]}
+      onScroll={[Function]}
       optionRef={[Function]}
       options={
         Array [
diff --git a/src/components/combo_box/combo_box.js b/src/components/combo_box/combo_box.js
index 08f8254a69d..5aa2e79df2d 100644
--- a/src/components/combo_box/combo_box.js
+++ b/src/components/combo_box/combo_box.js
@@ -723,6 +723,7 @@ export class EuiComboBox extends Component {
             fullWidth={fullWidth}
             rootId={this.rootId}
             onCloseList={this.closeList}
+            onScroll={() => this.searchInput.focus()}
           />
         </EuiPortal>
       );