More focus improvements

Author: yaira2

src/Files.App/UserControls/NavigationToolbar.xaml.cs

@@ -260,6 +260,7 @@ private async void Omnibar_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedE
 			if (Omnibar.CurrentSelectedMode == OmnibarPathMode)
 			{
 				await ViewModel.HandleItemNavigationAsync(args.Text);
+				(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
 			{
@@ -294,8 +295,7 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.CommandNotExecutable.GetLocali
 					}
 				}
 
-				ViewModel.OmnibarCurrentSelectedMode = OmnibarPathMode;
-				ViewModel.OmnibarCommandPaletteModeText = string.Empty;
+				(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
 			{
@@ -423,7 +423,10 @@ private void Omnibar_LostFocus(object sender, RoutedEventArgs e)
 		private void Omnibar_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 		{
 			if (e.Key is VirtualKey.Escape)
+			{
 				Omnibar.IsFocused = false;
+				(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
+			}
 		}
 	}
 }