From a9bc890497f1edaf4f177385cf96785de60e910c Mon Sep 17 00:00:00 2001 From: Mayank Verma Date: Sun, 2 Nov 2025 21:26:58 +0530 Subject: [PATCH] ui: Fix popover menu not restoring focus to the previously focused element (#41751) Closes #26548 Here's a before/after comparison: https://github.com/user-attachments/assets/21d49db7-28bb-4fe2-bdaf-e86b6400ae7a Release Notes: - Fixed popover menus not restoring focus to the previously focused element --- crates/ui/src/components/popover_menu.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui/src/components/popover_menu.rs b/crates/ui/src/components/popover_menu.rs index 439b53f0388114aa37adcf5277e87744e6f4f9e4..b1a52bec8fdf1f7030b5b321bed7702d602ff212 100644 --- a/crates/ui/src/components/popover_menu.rs +++ b/crates/ui/src/components/popover_menu.rs @@ -270,11 +270,11 @@ fn show_menu( window: &mut Window, cx: &mut App, ) { + let previous_focus_handle = window.focused(cx); let Some(new_menu) = (builder)(window, cx) else { return; }; let menu2 = menu.clone(); - let previous_focus_handle = window.focused(cx); window .subscribe(&new_menu, cx, move |modal, _: &DismissEvent, window, cx| {