Req

Author: 0x5bfa

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -412,9 +412,9 @@
 				UpdateTextOnSelect="False">
 				<controls:OmnibarMode.ItemTemplate>
 					<DataTemplate x:DataType="dataitems:NavigationBarSuggestionItem">
-						<Grid ColumnSpacing="12">
+						<Grid Padding="0,0,6,0" ColumnSpacing="12">
 							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="16" />
+								<ColumnDefinition Width="Auto" />
 								<ColumnDefinition Width="*" />
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
@@ -445,7 +445,6 @@
 							<keyboard:KeyboardShortcut
 								x:Name="RightAlignedKeyboardShortcut"
 								Grid.Column="2"
-								Margin="0,0,8,0"
 								VerticalAlignment="Center"
 								HotKeys="{x:Bind HotKeys}" />
 						</Grid>

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

@@ -466,19 +466,25 @@ private async void Omnibar_IsFocusedChanged(Omnibar sender, OmnibarIsFocusedChan
 						? Constants.UserEnvironmentPaths.HomePath
 						: ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory;
 
-					await DispatcherQueue.EnqueueOrInvokeAsync(async () =>
+					if (ViewModel.PathModeSuggestionItems.Count is 0)
 					{
-						await ViewModel.PopulateOmnibarSuggestionsForPathMode();
-					});
+						await DispatcherQueue.EnqueueOrInvokeAsync(async () =>
+						{
+							await ViewModel.PopulateOmnibarSuggestionsForPathMode();
+						});
+					}
 				}
 				else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
 				{
 					ViewModel.OmnibarCommandPaletteModeText = string.Empty;
 
-					await DispatcherQueue.EnqueueOrInvokeAsync(() =>
+					if (ViewModel.OmnibarCommandPaletteModeSuggestionItems.Count is 0)
 					{
-						ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
-					});
+						await DispatcherQueue.EnqueueOrInvokeAsync(() =>
+						{
+							ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
+						});
+					}
 				}
 				else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
 				{