Code Quality: Fixed issue where Omnibar sometimes stole focus

yaira2 · yaira2 · commit 2634ee86be74 · 2025-07-21T22:50:08.000-04:00
diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs
@@ -157,6 +157,9 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur
 			e.CurrentInstance.ContentChanged += TabItemContent_ContentChanged;
 
 			await NavigationHelpers.UpdateInstancePropertiesAsync(navArgs);
+
+			// Focus the content of the selected tab item (this also avoids an issue where the Omnibar sometimes steals the focus)
+			(ViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
 		}
 
 		private void PaneHolder_PropertyChanged(object? sender, PropertyChangedEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,9 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur`
`157`	`157`	`e.CurrentInstance.ContentChanged += TabItemContent_ContentChanged;`
`158`	`158`
`159`	`159`	`await NavigationHelpers.UpdateInstancePropertiesAsync(navArgs);`
	`160`	`+`
	`161`	`+ // Focus the content of the selected tab item (this also avoids an issue where the Omnibar sometimes steals the focus)`
	`162`	`+ (ViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);`
`160`	`163`	`}`
`161`	`164`
`162`	`165`	`private void PaneHolder_PropertyChanged(object? sender, PropertyChangedEventArgs e)`