Update

Author: 0x5bfa

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

@@ -30,6 +30,11 @@ private void AutoSuggestBox_LosingFocus(UIElement sender, LosingFocusEventArgs a
 				args.TryCancel();
 				return;
 			}
+
+			if (args.InputDevice is FocusInputDeviceKind.Keyboard || args.Direction is FocusNavigationDirection.Next or FocusNavigationDirection.Previous)
+			{
+				CurrentSelectedMode?.ContentOnInactive?.Focus(FocusState.Keyboard);
+			}
 		}
 
 		private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)

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

@@ -124,7 +124,6 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
 				// Add the reposition transition to the all modes
 				mode.Transitions = [new RepositionThemeTransition()];
 				mode.UpdateLayout();
-				mode.IsTabStop = true;
 			}
 
 			var index = _modesHostGrid.Children.IndexOf(newMode);
@@ -154,7 +153,6 @@ protected void ChangeMode(OmnibarMode? oldMode, OmnibarMode newMode)
 			ChangeTextBoxText(newMode.Text ?? string.Empty);
 
 			VisualStateManager.GoToState(newMode, "Focused", true);
-			newMode.IsTabStop = false;
 
 			ModeChanged?.Invoke(this, new(oldMode, newMode!));
 

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

@@ -7,6 +7,17 @@ namespace Files.App.Controls
 {
 	public partial class OmnibarMode
 	{
+		private void ModeButton_KeyDown(object sender, KeyRoutedEventArgs e)
+		{
+			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)
+				return;
+
+			if (e.Key is Windows.System.VirtualKey.Enter)
+			{
+				owner.CurrentSelectedMode = this;
+			}
+		}
+
 		private void ModeButton_PointerEntered(object sender, PointerRoutedEventArgs e)
 		{
 			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)

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

@@ -35,6 +35,7 @@ protected override void OnApplyTemplate()
 				?? throw new MissingFieldException($"Could not find {TemplatePartName_ModeButton} in the given {nameof(OmnibarMode)}'s style.");
 
 			Loaded += OmnibarMode_Loaded;
+			_modeButton.KeyDown += ModeButton_KeyDown;
 			_modeButton.PointerEntered += ModeButton_PointerEntered;
 			_modeButton.PointerPressed += ModeButton_PointerPressed;
 			_modeButton.PointerReleased += ModeButton_PointerReleased;