From acccd2ed4f6dc99359c836e0c4898c4e57400629 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 26 Aug 2025 06:23:43 +0000 Subject: [PATCH] Fix search results navigation focus issue - conditional focus on primary links Co-authored-by: yeelam-gordon <73506701+yeelam-gordon@users.noreply.github.com> --- .../SettingsPageControl/SettingsPageControl.xaml.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml.cs index 6e5fef091f..00a6458253 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml.cs +++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml.cs @@ -71,7 +71,11 @@ namespace Microsoft.PowerToys.Settings.UI.Controls private void UserControl_Loaded(object sender, RoutedEventArgs e) { - PrimaryLinksControl.Focus(FocusState.Programmatic); + // Only set focus to primary links if they exist and are visible + if (PrimaryLinks?.Count > 0 && PrimaryLinksControl.Visibility == Visibility.Visible) + { + PrimaryLinksControl.Focus(FocusState.Programmatic); + } } } }