diff --git a/src/components/combo_box/combo_box.js b/src/components/combo_box/combo_box.js index d2ee1b3ded5..a3de31946ff 100644 --- a/src/components/combo_box/combo_box.js +++ b/src/components/combo_box/combo_box.js @@ -175,9 +175,10 @@ export class EuiComboBox extends Component { } // Group titles are included in option list but are not selectable - // Skip group title options + // Skip group title options and disabled options const direction = amount > 0 ? 1 : -1; - while (this.matchingOptions[nextActiveOptionIndex].isGroupLabelOption) { + while (this.matchingOptions[nextActiveOptionIndex].isGroupLabelOption + || this.matchingOptions[nextActiveOptionIndex].disabled) { nextActiveOptionIndex = nextActiveOptionIndex + direction; if (nextActiveOptionIndex < 0) {