diff --git a/packages/react/src/components/ComboBox/ComboBox-story.js b/packages/react/src/components/ComboBox/ComboBox-story.js
index a32aff37356f..f6f95713cee4 100644
--- a/packages/react/src/components/ComboBox/ComboBox-story.js
+++ b/packages/react/src/components/ComboBox/ComboBox-story.js
@@ -54,7 +54,7 @@ const itemToElement = item => {
return (
{itemAsArray[0]}
- {itemAsArray[1]}
+ {itemAsArray[1]}
);
};
diff --git a/packages/react/src/components/ComboBox/ComboBox.js b/packages/react/src/components/ComboBox/ComboBox.js
index f1ad3dbceda1..1f4ce7603b60 100644
--- a/packages/react/src/components/ComboBox/ComboBox.js
+++ b/packages/react/src/components/ComboBox/ComboBox.js
@@ -324,8 +324,8 @@ export default class ComboBox extends React.Component {
aria-labelledby={comboBoxA11yId}
tabIndex="0"
aria-disabled={disabled}
- aria-controls={`${id}__menu`}
- aria-owns={`${id}__menu`}
+ aria-controls={isOpen ? `${id}__menu` : null}
+ aria-owns={isOpen ? `${id}__menu` : null}
aria-autocomplete="list"
ref={this.textInput}
{...rest}