Update

Author: 0x5bfa

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Input;
 using Windows.Foundation;
 
 namespace Files.App.Controls
@@ -25,6 +26,8 @@ public partial class BreadcrumbBar : Control
 
 		private bool _isEllipsisRendered;
 
+		private bool _focusedViaKeyboard = false; // Used to determine if the BreadcrumbBar was focused via keyboard on Tab focus
+
 		// Properties
 
 		public int IndexAfterEllipsis
@@ -62,11 +65,18 @@ protected override void OnApplyTemplate()
 			_ellipsisBreadcrumbBarItem.SetOwner(this);
 			_itemsRepeater.Layout = _itemsRepeaterLayout;
 
+			//GettingFocus += BreadcrumbBar_GettingFocus;
+			//GettingFocus += BreadcrumbBar_GotFocus;
 			_itemsRepeater.ElementPrepared += ItemsRepeater_ElementPrepared;
 			_itemsRepeater.ElementClearing += ItemsRepeater_ElementClearing;
 			_itemsRepeater.ItemsSourceView.CollectionChanged += ItemsSourceView_CollectionChanged;
 		}
 
+		private void BreadcrumbBar_GettingFocus(UIElement sender, GettingFocusEventArgs args)
+		{
+			_focusedViaKeyboard = args.InputDevice is FocusInputDeviceKind.Keyboard;
+		}
+
 		internal protected virtual void RaiseItemClickedEvent(BreadcrumbBarItem item)
 		{
 			var index = _itemsRepeater?.GetElementIndex(item) ?? throw new ArgumentNullException($"{_itemsRepeater} is null.");
@@ -122,6 +132,11 @@ internal bool TryGetElement(int index, out BreadcrumbBarItem? item)
 
 		// Event methods
 
+		private void BreadcrumbBar_GotFocus(object sender, RoutedEventArgs e)
+		{
+			_rootBreadcrumbBarItem?.Focus(FocusState.Keyboard);
+		}
+
 		private void ItemsRepeater_ElementPrepared(ItemsRepeater sender, ItemsRepeaterElementPreparedEventArgs args)
 		{
 			if (args.Element is not BreadcrumbBarItem item || _itemsRepeater is null)

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml

@@ -57,7 +57,8 @@
 							Grid.Column="0"
 							Padding="{StaticResource BreadcrumbBarRootItemPadding}"
 							CornerRadius="{StaticResource BreadcrumbBarRootItemCornerRadius}"
-							ItemToolTip="{TemplateBinding RootItemToolTip}">
+							ItemToolTip="{TemplateBinding RootItemToolTip}"
+							TabIndex="0">
 							<ContentPresenter Content="{Binding RootItem, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
 						</local:BreadcrumbBarItem>
 

src/Files.App.Controls/Omnibar/Omnibar.Events.cs

@@ -33,7 +33,7 @@ private void AutoSuggestBox_LosingFocus(UIElement sender, LosingFocusEventArgs a
 
 			if (args.InputDevice is FocusInputDeviceKind.Keyboard || args.Direction is FocusNavigationDirection.Next or FocusNavigationDirection.Previous)
 			{
-				CurrentSelectedMode?.ContentOnInactive?.Focus(FocusState.Keyboard);
+				CurrentSelectedMode?.ContentOnInactive?.Focus(FocusState.Programmatic);
 			}
 		}
 

src/Files.App.Controls/Omnibar/Omnibar.xaml

@@ -117,8 +117,8 @@
 		<Setter Property="HorizontalContentAlignment" Value="Left" />
 		<Setter Property="VerticalAlignment" Value="Stretch" />
 
-		<Setter Property="IsTabStop" Value="True" />
-		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+		<!--<Setter Property="IsTabStop" Value="True" />
+		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />-->
 
 		<Setter Property="Template">
 			<Setter.Value>