diff --git a/src/Files.App.Controls/Omnibar/Omnibar.cs b/src/Files.App.Controls/Omnibar/Omnibar.cs
index 80d310061eb5..131ca89f4ef5 100644
--- a/src/Files.App.Controls/Omnibar/Omnibar.cs
+++ b/src/Files.App.Controls/Omnibar/Omnibar.cs
@@ -219,6 +219,12 @@ internal protected bool TryToggleIsSuggestionsPopupOpen(bool wantToOpen)
 				return false;
 			}
 
+			if (CurrentSelectedMode is not null)
+			{
+				_textBoxSuggestionsListView.ItemTemplate = CurrentSelectedMode.ItemTemplate;
+				_textBoxSuggestionsListView.ItemsSource = CurrentSelectedMode.ItemsSource;
+			}
+
 			_textBoxSuggestionsPopup.IsOpen = wantToOpen;
 
 			GlobalHelper.WriteDebugStringForOmnibar("The suggestions pop-up is open.");
diff --git a/src/Files.App.Controls/Omnibar/OmnibarMode.cs b/src/Files.App.Controls/Omnibar/OmnibarMode.cs
index e91e05abe24b..c81216c25a08 100644
--- a/src/Files.App.Controls/Omnibar/OmnibarMode.cs
+++ b/src/Files.App.Controls/Omnibar/OmnibarMode.cs
@@ -35,7 +35,13 @@ protected override void OnApplyTemplate()
 
 			_modeButton = GetTemplateChild(TemplatePartName_ModeButton) as Button
 				?? throw new MissingFieldException($"Could not find {TemplatePartName_ModeButton} in the given {nameof(OmnibarMode)}'s style.");
-			
+
+			RegisterPropertyChangedCallback(ItemsSourceProperty, (d, dp) =>
+			{
+				if (_ownerRef is not null && _ownerRef.TryGetTarget(out var owner))
+					owner.TryToggleIsSuggestionsPopupOpen(true);
+			});
+
 			Loaded += OmnibarMode_Loaded;
 			_modeButton.PointerEntered += ModeButton_PointerEntered;
 			_modeButton.PointerPressed += ModeButton_PointerPressed;
diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml b/src/Files.App/UserControls/NavigationToolbar.xaml
index 697ae5df3c36..a9fa7e44ff6a 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml
@@ -407,26 +407,29 @@
 					<DataTemplate x:DataType="dataitems:NavigationBarSuggestionItem">
 						<Grid Padding="0,0,4,0" ColumnSpacing="12">
 							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="16" />
+								<!--<ColumnDefinition Width="Auto" />-->
 								<ColumnDefinition Width="*" />
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
 
-							<Grid Grid.Column="0">
+							<!--<Grid
+								Grid.Column="0"
+								Width="16"
+								Height="16">
 								<Viewbox
 									Width="16"
 									Height="16"
-									Visibility="{x:Bind Glyph, Converter={StaticResource NullToVisibilityCollapsedConverter}}">
-									<FontIcon Foreground="{ThemeResource App.Theme.IconBaseBrush}" Glyph="{x:Bind Glyph}" />
+									Visibility="{x:Bind Glyph, Converter={StaticResource NullToVisibilityCollapsedConverter}, Mode=OneWay}">
+									<FontIcon Foreground="{ThemeResource App.Theme.IconBaseBrush}" Glyph="{x:Bind Glyph, Mode=OneWay}" />
 								</Viewbox>
-								<controls:ThemedIcon Style="{x:Bind ThemedIconStyle}" Visibility="{x:Bind ThemedIconStyle, Converter={StaticResource NullToVisibilityCollapsedConverter}}" />
+								<controls:ThemedIcon Style="{x:Bind ThemedIconStyle, Mode=OneWay}" Visibility="{x:Bind ThemedIconStyle, Converter={StaticResource NullToVisibilityCollapsedConverter}, Mode=OneWay}" />
 								<Image Source="{x:Bind ActionIconSource, Mode=OneWay}" />
-							</Grid>
+							</Grid>-->
 
 							<!--  Primary Title  -->
 							<TextBlock
 								x:Name="PrimaryDisplayBlock"
-								Grid.Column="1"
+								Grid.Column="0"
 								VerticalAlignment="Center"
 								Foreground="{ThemeResource TextFillColorPrimaryBrush}"
 								TextTrimming="CharacterEllipsis"
@@ -437,9 +440,9 @@
 							<!--  Keyboard Shortcuts  -->
 							<keyboard:KeyboardShortcut
 								x:Name="RightAlignedKeyboardShortcut"
-								Grid.Column="2"
+								Grid.Column="1"
 								VerticalAlignment="Center"
-								HotKeys="{x:Bind HotKeys}" />
+								HotKeys="{x:Bind HotKeys, Mode=OneWay}" />
 						</Grid>
 					</DataTemplate>
 				</controls:OmnibarMode.ItemTemplate>