diff --git a/src/Files.App/Data/Items/NavigationBarSuggestionItem.cs b/src/Files.App/Data/Items/NavigationBarSuggestionItem.cs
index 35970397d594..044291902261 100644
--- a/src/Files.App/Data/Items/NavigationBarSuggestionItem.cs
+++ b/src/Files.App/Data/Items/NavigationBarSuggestionItem.cs
@@ -1,11 +1,20 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using Files.App.Controls;
+
 namespace Files.App.Data.Items
 {
 	[Obsolete("Remove once Omnibar goes out of experimental.")]
-	public sealed partial class NavigationBarSuggestionItem : ObservableObject
+	public sealed partial class NavigationBarSuggestionItem : ObservableObject, IOmnibarTextMemberPathProvider
 	{
+		private object? _Icon;
+		public object? Icon
+		{
+			get => _Icon;
+			set => SetProperty(ref _Icon, value);
+		}
+
 		private string? _Text;
 		public string? Text
 		{
@@ -88,5 +97,16 @@ private void UpdatePrimaryDisplay()
 				}
 			}
 		}
+
+		public string GetTextMemberPath(string textMemberPath)
+		{
+			return textMemberPath switch
+			{
+				nameof(Text) => Text,
+				nameof(PrimaryDisplay) => PrimaryDisplay,
+				nameof(SearchText) => SearchText,
+				_ => string.Empty
+			};
+		}
 	}
 }
diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml b/src/Files.App/UserControls/NavigationToolbar.xaml
index abb235b9c725..02adc64e731a 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml
@@ -383,42 +383,47 @@
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IconType=Outline}"
 				ModeName="{helpers:ResourceString Name=CommandPalette}"
-				PlaceholderText="{helpers:ResourceString Name=OmnibarCommandPaletteModeTextPlaceholder}">
-				<!--<controls:OmnibarMode.SuggestionItemTemplate>
-					<DataTemplate x:DataType="data:OmnibarPaletteSuggestionItem">
-						<Grid Height="48" ColumnSpacing="12">
+				PlaceholderText="{helpers:ResourceString Name=OmnibarCommandPaletteModeTextPlaceholder}"
+				SuggestionItemsSource="{x:Bind ViewModel.OmnibarCommandPaletteModeSuggestionItems, Mode=OneWay}"
+				Text="{x:Bind ViewModel.OmnibarCommandPaletteModeText, Mode=TwoWay}"
+				TextMemberPath="Text">
+				<controls:OmnibarMode.SuggestionItemTemplate>
+					<DataTemplate x:DataType="dataitems:NavigationBarSuggestionItem">
+						<Grid ColumnSpacing="12">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Width="Auto" />
 								<ColumnDefinition Width="*" />
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
-							<controls:ThemedIcon
-								Width="20"
-								Height="20"
+
+							<Viewbox
+								Grid.Column="0"
+								Width="16"
+								Height="16">
+								<ContentPresenter Content="{x:Bind Icon, Mode=OneWay}" />
+							</Viewbox>
+
+							<!--  Primary Title  -->
+							<TextBlock
+								x:Name="PrimaryDisplayBlock"
+								Grid.Column="1"
 								VerticalAlignment="Center"
-								Style="{StaticResource App.ThemedIcons.Actions.Copying}" />
-							<StackPanel Grid.Column="1" VerticalAlignment="Center">
-								<TextBlock
-									Style="{StaticResource BodyStrongTextBlockStyle}"
-									Text="{x:Bind Title}"
-									TextTrimming="CharacterEllipsis"
-									TextWrapping="NoWrap" />
-								<TextBlock
-									Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-									Style="{StaticResource CaptionTextBlockStyle}"
-									Text="{x:Bind Description}"
-									TextTrimming="CharacterEllipsis"
-									TextWrapping="NoWrap" />
-							</StackPanel>
-							<StackPanel Grid.Column="2" VerticalAlignment="Center">
-								<TextBlock
-									Text="{x:Bind HotKeys}"
-									TextTrimming="CharacterEllipsis"
-									TextWrapping="NoWrap" />
-							</StackPanel>
+								Foreground="{ThemeResource TextFillColorPrimaryBrush}"
+								MaxLines="1"
+								TextTrimming="CharacterEllipsis"
+								TextWrapping="NoWrap">
+								<Run FontWeight="Normal" Text="{x:Bind PrimaryDisplayPreMatched, Mode=OneWay}" /><Run FontWeight="Bold" Text="{x:Bind PrimaryDisplayMatched, Mode=OneWay}" /><Run FontWeight="Normal" Text="{x:Bind PrimaryDisplayPostMatched, Mode=OneWay}" />
+							</TextBlock>
+
+							<!--  Keyboard Shortcuts  -->
+							<keyboard:KeyboardShortcut
+								x:Name="RightAlignedKeyboardShortcut"
+								Grid.Column="2"
+								VerticalAlignment="Center"
+								HotKeys="{x:Bind HotKeys, Mode=OneWay}" />
 						</Grid>
 					</DataTemplate>
-				</controls:OmnibarMode.SuggestionItemTemplate>-->
+				</controls:OmnibarMode.SuggestionItemTemplate>
 			</controls:OmnibarMode>
 
 			<controls:OmnibarMode
diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml.cs b/src/Files.App/UserControls/NavigationToolbar.xaml.cs
index cb36f2f341b2..2c5bbbf14c7b 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml.cs
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml.cs
@@ -256,19 +256,47 @@ private void ClickablePath_GettingFocus(UIElement sender, GettingFocusEventArgs
 
 		private async void Omnibar_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedEventArgs args)
 		{
-			await ViewModel.HandleItemNavigationAsync(args.Text);
+			if (Omnibar.CurrentSelectedMode == OmnibarPathMode)
+			{
+				await ViewModel.HandleItemNavigationAsync(args.Text);
+			}
+			else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
+			{
+			}
+			else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
+			{
+			}
 		}
 
 		private async void Omnibar_SuggestionChosen(Omnibar sender, OmnibarSuggestionChosenEventArgs args)
 		{
-			if (args.SelectedItem is OmnibarPathModeSuggestionModel item &&
-				!string.IsNullOrEmpty(item.Path))
-				await ViewModel.HandleItemNavigationAsync(item.Path);
+			if (Omnibar.CurrentSelectedMode == OmnibarPathMode)
+			{
+				if (args.SelectedItem is OmnibarPathModeSuggestionModel item &&
+					!string.IsNullOrEmpty(item.Path))
+					await ViewModel.HandleItemNavigationAsync(item.Path);
+			}
+			else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
+			{
+			}
+			else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
+			{
+			}
 		}
 
 		private async void Omnibar_TextChanged(Omnibar sender, OmnibarTextChangedEventArgs args)
 		{
-			await ViewModel.PopulateOmnibarSuggestionsForPathMode();
+			if (Omnibar.CurrentSelectedMode == OmnibarPathMode)
+			{
+				await ViewModel.PopulateOmnibarSuggestionsForPathMode();
+			}
+			else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
+			{
+				ViewModel.PopulateOmnibarSuggestionsForCommandPaletteMode();
+			}
+			else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
+			{
+			}
 		}
 
 		private async void BreadcrumbBar_ItemClicked(Controls.BreadcrumbBar sender, Controls.BreadcrumbBarItemClickedEventArgs args)
diff --git a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
index 6ebe943cc44f..1aae75d648e0 100644
--- a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
@@ -71,6 +71,8 @@ public sealed partial class NavigationToolbarViewModel : ObservableObject, IAddr
 
 		internal ObservableCollection<OmnibarPathModeSuggestionModel> PathModeSuggestionItems { get; } = [];
 
+		internal ObservableCollection<NavigationBarSuggestionItem> OmnibarCommandPaletteModeSuggestionItems { get; } = [];
+
 		public bool IsSingleItemOverride { get; set; }
 
 		public bool SearchHasFocus { get; private set; }
@@ -218,6 +220,8 @@ public string? PathText
 			}
 		}
 
+		private string? _OmnibarCommandPaletteModeText;
+		public string? OmnibarCommandPaletteModeText { get => _OmnibarCommandPaletteModeText; set => SetProperty(ref _OmnibarCommandPaletteModeText, value); }
 
 		private bool _IsOmnibarFocused;
 		public  bool IsOmnibarFocused
@@ -239,6 +243,8 @@ public  bool IsOmnibarFocused
 								_ = PopulateOmnibarSuggestionsForPathMode();
 								break;
 							case OmnibarPaletteModeName:
+								if (OmnibarCommandPaletteModeSuggestionItems.Count is 0)
+									PopulateOmnibarSuggestionsForCommandPaletteMode();
 								break;
 							case OmnibarSearchModeName:
 								break;
@@ -1126,6 +1132,32 @@ void AddNoResultsItem()
 			}
 		}
 
+		public void PopulateOmnibarSuggestionsForCommandPaletteMode()
+		{
+			OmnibarCommandPaletteModeText ??= string.Empty;
+
+			OmnibarCommandPaletteModeSuggestionItems.Clear();
+
+			IList<NavigationBarSuggestionItem>? suggestions = null;
+
+			suggestions = [.. Commands.Where(command =>
+				command.IsExecutable &&
+				command.IsAccessibleGlobally &&
+				(command.Description.Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase) ||
+				command.Code.ToString().Contains(OmnibarCommandPaletteModeText, StringComparison.OrdinalIgnoreCase)))
+			.Select(command => new NavigationBarSuggestionItem()
+			{
+				Icon = command.Icon,
+				Text = command.Code.ToString(),
+				PrimaryDisplay = command.Description,
+				HotKeys = command.HotKeys,
+				SearchText = OmnibarCommandPaletteModeText,
+			})];
+
+			foreach (var suggestionItem in suggestions)
+				OmnibarCommandPaletteModeSuggestionItems.Add(suggestionItem);
+		}
+
 		[Obsolete("Remove once Omnibar goes out of experimental.")]
 		public async Task SetAddressBarSuggestionsAsync(AutoSuggestBox sender, IShellPage shellpage)
 		{