diff --git a/packages/components/src/autocomplete/index.js b/packages/components/src/autocomplete/index.js index 3c66e5f4d21cfd..38a5a0d58fd6bb 100644 --- a/packages/components/src/autocomplete/index.js +++ b/packages/components/src/autocomplete/index.js @@ -409,7 +409,7 @@ export class Autocomplete extends Component { break; case ESCAPE: - this.setState( { autocompleter: null } ); + this.setState( { autocompleter: null, AutocompleterUI: null } ); break; case ENTER: @@ -428,6 +428,7 @@ export class Autocomplete extends Component { // Any handled keycode should prevent original behavior. This relies on // the early return in the default case. event.preventDefault(); + event.stopPropagation(); } componentDidUpdate( prevProps ) {