Update

Author: 0x5bfa

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -322,7 +322,7 @@
 			Grid.Column="1"
 			x:Load="{x:Bind ViewModel.EnableOmnibar, Mode=OneWay}"
 			CurrentSelectedModeName="{x:Bind ViewModel.OmnibarCurrentSelectedModeName, Mode=TwoWay}"
-			IsFocused="{x:Bind ViewModel.IsOmnibarFocused, Mode=TwoWay}"
+			GotFocus="Omnibar_GotFocus"
 			LostFocus="Omnibar_LostFocus"
 			PreviewKeyDown="Omnibar_PreviewKeyDown"
 			QuerySubmitted="Omnibar_QuerySubmitted"

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

@@ -23,6 +23,7 @@ public sealed partial class NavigationToolbar : UserControl
 		private readonly MainPageViewModel MainPageViewModel = Ioc.Default.GetRequiredService<MainPageViewModel>();
 		private readonly ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();
 		private readonly StatusCenterViewModel OngoingTasksViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
+		private readonly IContentPageContext ContentPageContext = Ioc.Default.GetRequiredService<IContentPageContext>();
 
 		// Properties
 
@@ -411,6 +412,27 @@ private void BreadcrumbBar_ItemDropDownFlyoutClosed(object sender, BreadcrumbBar
 			e.Flyout.Items.Clear();
 		}
 
+		private async void Omnibar_GotFocus(object sender, RoutedEventArgs e)
+		{
+			switch (ViewModel.OmnibarCurrentSelectedModeName)
+			{
+				case NavigationToolbarViewModel.OmnibarPathModeName:
+					ViewModel.PathText =
+						string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)
+							? Constants.UserEnvironmentPaths.HomePath
+							: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
+					await ViewModel.PopulateOmnibarSuggestionsForPathMode();
+					break;
+				case NavigationToolbarViewModel.OmnibarPaletteModeName:
+					ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
+					break;
+				case NavigationToolbarViewModel.OmnibarSearchModeName:
+					break;
+				default:
+					break;
+			}
+		}
+
 		private void Omnibar_LostFocus(object sender, RoutedEventArgs e)
 		{
 			if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)

src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs

@@ -230,39 +230,6 @@ public string? PathText
 		private string? _OmnibarCommandPaletteModeText;
 		public string? OmnibarCommandPaletteModeText { get => _OmnibarCommandPaletteModeText; set => SetProperty(ref _OmnibarCommandPaletteModeText, value); }
 
-		private bool _IsOmnibarFocused;
-		public bool IsOmnibarFocused
-		{
-			get => _IsOmnibarFocused;
-			set
-			{
-				// NOTE: Don't call ObservableObject.SetProperty() here since we don't want to change focus logic outside of the control.
-
-				_IsOmnibarFocused = value;
-
-				if (value)
-				{
-					switch (OmnibarCurrentSelectedModeName)
-					{
-						case OmnibarPathModeName:
-							PathText =
-								string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory)
-									? Constants.UserEnvironmentPaths.HomePath
-									: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
-							_ = PopulateOmnibarSuggestionsForPathMode();
-							break;
-						case OmnibarPaletteModeName:
-							PopulateOmnibarSuggestionsForCommandPaletteMode();
-							break;
-						case OmnibarSearchModeName:
-							break;
-						default:
-							break;
-					}
-				}
-			}
-		}
-
 		private string _OmnibarCurrentSelectedModeName = OmnibarPathModeName;
 		public string OmnibarCurrentSelectedModeName { get => _OmnibarCurrentSelectedModeName; set => SetProperty(ref _OmnibarCurrentSelectedModeName, value); }
 
@@ -735,7 +702,6 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidItemDialogTitle.GetLoca
 			}
 
 			PathControlDisplayText = ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
-			IsOmnibarFocused = false;
 		}
 
 		public void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
@@ -1074,6 +1040,8 @@ private static async Task<bool> LaunchApplicationFromPath(string currentInput, s
 
 		public async Task PopulateOmnibarSuggestionsForPathMode()
 		{
+			PathModeSuggestionItems.Clear();
+
 			var result = await SafetyExtensions.IgnoreExceptions((Func<Task<bool>>)(async () =>
 			{
 				List<OmnibarPathModeSuggestionModel>? newSuggestions = [];