Update NavigationToolbar.xaml.cs

Author: yaira2

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

@@ -317,12 +317,17 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidCommand.GetLocalizedRes
 			else if (mode == OmnibarSearchMode)
 			{
 				var shellPage = Ioc.Default.GetRequiredService<IContentPageContext>().ShellPage;
+
 				if (args.Item is SuggestionModel item && !string.IsNullOrWhiteSpace(item.ItemPath) && shellPage is not null)
 					await NavigationHelpers.OpenPath(item.ItemPath, shellPage);
 				else
 				{
-					ContentPageContext.ShellPage?.SubmitSearch(args.Text);
-					ViewModel.SaveSearchQueryToList(args.Text);
+					var searchQuery = args.Item is SuggestionModel x && !string.IsNullOrWhiteSpace(x.Name)
+						? x.Name
+						: args.Text;
+
+					shellPage?.SubmitSearch(searchQuery); // use the resolved shellPage for consistency
+					ViewModel.SaveSearchQueryToList(searchQuery);
 				}
 			}
 		}