diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockPageControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockPageControl.xaml index c2ed8c7b72..58253ffe32 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockPageControl.xaml +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockPageControl.xaml @@ -50,19 +50,19 @@ SourceKey="{x:Bind Navigation.CurrentPage.Icon, Mode=OneWay}" SourceRequested="{x:Bind help:IconProvider.SourceRequested20}" Visibility="{x:Bind Navigation.CurrentPage.IsRootPage, Mode=OneWay}"> - + - + diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockPageFlyoutController.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockPageFlyoutController.cs index c2d9f1a9e5..75ae264e4b 100644 --- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockPageFlyoutController.cs +++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Dock/DockPageFlyoutController.cs @@ -371,6 +371,11 @@ internal sealed partial class DockPageFlyoutController : PInvoke.SetForegroundWindow(ownerHwnd); PInvoke.SetActiveWindow(ownerHwnd); + if (request.Anchor is Control anchorControl) + { + anchorControl.Focus(FocusState.Programmatic); + } + PreparePopupForShow(request.Anchor); _flyout.ShowAt( request.Anchor,