[vedantggwp]

Closing a keyboard-opened Settings dropdown leaves focus on the window root, so the next Tab jumps back to the sidebar. This restores focus to the originating control after Escape or selection, provided keyboard mode remains active and focus hasn’t moved elsewhere.

Follow-up to testing feedback on #2775.

Tested on macOS using an isolated app/profile:

• Reproduced the bug on unchanged main at c9a917a53.
• Verified Countdown dismissal, selection, reopening, and forward/reverse Tab navigation after the fix.
• Verified dismissal and selection in the Automation trigger dropdown.
• Native build, cargo check, and 29 existing Settings/menu/navigation tests passed.

Changed-file formatting passes. Workspace formatting and Clippy report existing failures, confirmed against unchanged main. Focus restoration was tested in the running app; the existing unit tests don’t directly cover it.

Mouse dropdown interaction remains unverified because the automation tool failed to resolve coordinate clicks. No screen-reader or other-platform testing claimed.

Confidence Score: 5/5

The PR appears safe to merge; no actionable defects were found.

Summary

Restores focus after a keyboard-opened Settings dropdown closes.

• Settings dropdowns return keyboard focus to the control that opened them.

Static review found no actionable issues. Native UI behavior was not independently tested on this Linux host.

_{Reviews (1) · Last reviewed commit: "fix(desktop-gpui): restore focus after c..." · Reviewed by Greptile}

[vercel]

@vedantggwp is attempting to deploy a commit to the Cap Software Inc Team on Vercel.

A member of the Team first needs to authorize it.