diff --git a/packages/react-ui/internal/RenderLayer/RenderLayer.tsx b/packages/react-ui/internal/RenderLayer/RenderLayer.tsx index 5aa0fec1c6..3d42df02ab 100644 --- a/packages/react-ui/internal/RenderLayer/RenderLayer.tsx +++ b/packages/react-ui/internal/RenderLayer/RenderLayer.tsx @@ -1,5 +1,6 @@ import React from 'react'; import { findDOMNode } from 'react-dom'; +import tabbable from 'tabbable'; import { listen as listenFocusOutside, containsTargetOrRenderContainer } from '../../lib/listenFocusOutside'; import { CommonProps, CommonWrapper } from '../CommonWrapper'; @@ -85,7 +86,7 @@ export class RenderLayer extends React.Component { } private handleFocusOutside = (event: Event) => { - if (this.props.onFocusOutside) { + if (this.props.onFocusOutside && event.target && tabbable.isFocusable(event.target as HTMLElement)) { this.props.onFocusOutside(event); } };