@@ -75,13 +75,21 @@ export default function useAccessibility({
 
   React.useEffect(() => {
     if (open) {
-      window.addEventListener('keydown', handleKeyDown, true);
+      const handleCapture = (event: KeyboardEvent) => {
+        if (event.keyCode === ESC) handleKeyDown(event);
+      };
+      const handleBubble = (event: KeyboardEvent) => {
+        if (event.keyCode !== ESC) handleKeyDown(event);
+      };
+      window.addEventListener('keydown', handleCapture, true);
+      window.addEventListener('keydown', handleBubble);
       if (autoFocus) {
         // FIXME: hack with raf
         raf(() => focusMenu({ preventScroll: true }), 3);
       }
       return () => {
-        window.removeEventListener('keydown', handleKeyDown, true);
+        window.removeEventListener('keydown', handleCapture, true);
+        window.removeEventListener('keydown', handleBubble);
         focusMenuRef.current = false;
       };
     }
 
@@ -56,3 +56,80 @@ it('closes and returns focus to trigger on Escape key', () => {
     trigger.remove();
   }
 });
+
+it('lets an overlay handle Tab before the window listener', () => {
+  const trigger = document.createElement('button');
+  const overlay = document.createElement('div');
+  const input = document.createElement('input');
+  overlay.tabIndex = -1;
+  overlay.appendChild(input);
+  document.body.append(trigger, overlay);
+  const onOpenChange = jest.fn();
+  input.addEventListener('keydown', (event) => event.stopPropagation());
+  const { unmount } = renderHook(() =>
+    useAccessibility({
+      open: true,
+      triggerRef: { current: trigger },
+      overlayRef: { current: overlay },
+      onOpenChange,
+    }),
+  );
+  try {
+    input.focus();
+    const event = new KeyboardEvent('keydown', {
+      key: 'Tab',
+      keyCode: 9,
+      bubbles: true,
+      cancelable: true,
+    });
+    act(() => {
+      input.dispatchEvent(event);
+    });
+    expect(document.activeElement).toBe(input);
+    expect(event.defaultPrevented).toBe(false);
+    expect(onOpenChange).not.toHaveBeenCalled();
+  } finally {
+    unmount();
+    trigger.remove();
+    overlay.remove();
+  }
+});
+
+it('restores focus before an earlier window bubble listener unmounts the hook', () => {
+  const trigger = document.createElement('button');
+  const item = document.createElement('button');
+  document.body.append(trigger, item);
+  item.focus();
+  const onOpenChange = jest.fn();
+  let teardown = () => {};
+  const portalListener = () => teardown();
+  window.addEventListener('keydown', portalListener);
+  const { unmount } = renderHook(() =>
+    useAccessibility({
+      open: true,
+      triggerRef: { current: trigger },
+      onOpenChange,
+    }),
+  );
+  teardown = unmount;
+  try {
+    act(() => {
+      item.dispatchEvent(
+        new KeyboardEvent('keydown', {
+          key: 'Escape',
+          keyCode: 27,
+          bubbles: true,
+          cancelable: true,
+        }),
+      );
+    });
+    expect(onOpenChange).toHaveBeenCalledTimes(1);
+    expect(onOpenChange).toHaveBeenCalledWith(false);
+    expect(document.activeElement).toBe(trigger);
+  } finally {
+    window.removeEventListener('keydown', portalListener);
+    unmount();
+    trigger.remove();
+    item.remove();
+  }
+});