diff --git a/src/components/Suggestion/suggestions.js b/src/components/Suggestion/suggestions.js index 357026acf0d..3981d01a6aa 100644 --- a/src/components/Suggestion/suggestions.js +++ b/src/components/Suggestion/suggestions.js @@ -56,19 +56,24 @@ export default ({ }, onKeyDown(props) { - if (!popup) { - return - } - if (props.event.key === 'Escape') { - popup[0].hide() - popup[0].destroy() - component.destroy() - popup = null + // Prevent Viewer from closing as well + props.event.stopPropagation() + + if (popup) { + popup[0].hide() + popup[0].destroy() + component.destroy() + popup = null + } return true } + if (!popup) { + return + } + return component.ref?.onKeyDown?.(props) },