diff --git a/Settings.XamlStyler b/Settings.XamlStyler
index 117aea82adf0..d831092fff19 100644
--- a/Settings.XamlStyler
+++ b/Settings.XamlStyler
@@ -1,3 +1,4 @@
 {
-  "IndentWithTabs":  true
+  "IndentWithTabs":  true,
+  "NoNewLineMarkupExtensions": "x:Bind, Binding, controls:ThemedIconMarkup",
 }
\ No newline at end of file
diff --git a/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.cs b/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.cs
index b43b0ab454c1..500fee8a96a0 100644
--- a/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.cs
+++ b/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.cs
@@ -42,7 +42,7 @@ public BreadcrumbBar()
 		{
 			DefaultStyleKey = typeof(BreadcrumbBar);
 
-			_itemsRepeaterLayout = new(this, 2d);
+			_itemsRepeaterLayout = new(this);
 		}
 
 		// Methods
@@ -87,12 +87,13 @@ internal protected virtual void RaiseItemDropDownFlyoutClosed(BreadcrumbBarItem
 
 		internal protected virtual void OnLayoutUpdated()
 		{
-			if (_itemsRepeater is null)
+			if (_itemsRepeater is null || (_itemsRepeaterLayout.IndexAfterEllipsis > _itemsRepeaterLayout.VisibleItemsCount && _isEllipsisRendered))
 				return;
 
+			if (_ellipsisBreadcrumbBarItem is not null && _isEllipsisRendered != _itemsRepeaterLayout.EllipsisIsRendered)
+				_ellipsisBreadcrumbBarItem.Visibility = _itemsRepeaterLayout.EllipsisIsRendered ? Visibility.Visible : Visibility.Collapsed;
+
 			_isEllipsisRendered = _itemsRepeaterLayout.EllipsisIsRendered;
-			if (_ellipsisBreadcrumbBarItem is not null)
-				_ellipsisBreadcrumbBarItem.Visibility = _isEllipsisRendered ? Visibility.Visible : Visibility.Collapsed;
 
 			for (int accessibilityIndex = 0, collectionIndex = _itemsRepeaterLayout.IndexAfterEllipsis;
 				accessibilityIndex < _itemsRepeaterLayout.VisibleItemsCount;
diff --git a/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml b/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml
index 5f92aed85ec2..213ab4cd8340 100644
--- a/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml
+++ b/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml
@@ -5,13 +5,14 @@
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:local="using:Files.App.Controls">
 
-	<x:Double x:Key="BreadcrumbBarHeight">32</x:Double>
+	<x:Double x:Key="BreadcrumbBarHeight">34</x:Double>
 	<x:Double x:Key="BreadcrumbBarMinWidth">120</x:Double>
 	<x:Double x:Key="BreadcrumbBarEllipsisFontSize">16</x:Double>
 
 	<Thickness x:Key="BreadcrumbBarChevronPadding">4,0</Thickness>
 	<Thickness x:Key="BreadcrumbBarItemPadding">8,0</Thickness>
 	<Thickness x:Key="BreadcrumbBarRootItemPadding">16,0,8,0</Thickness>
+	<Thickness x:Key="BreadcrumbBarItemMargin">2,0,0,0</Thickness>
 
 	<CornerRadius x:Key="BreadcrumbBarItemCornerRadius">2,2,2,2</CornerRadius>
 	<CornerRadius x:Key="BreadcrumbBarChevronCornerRaduis">2,2,2,2</CornerRadius>
@@ -21,21 +22,33 @@
 	<Style BasedOn="{StaticResource DefaultBreadcrumbBarItemStyle}" TargetType="local:BreadcrumbBarItem" />
 
 	<Style x:Key="DefaultBreadcrumbBarStyle" TargetType="local:BreadcrumbBar">
+
 		<Setter Property="MinWidth" Value="{StaticResource BreadcrumbBarMinWidth}" />
+
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+
 		<Setter Property="AutomationProperties.LandmarkType" Value="Navigation" />
+
 		<Setter Property="IsTabStop" Value="False" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="local:BreadcrumbBar">
 					<Grid
 						MinWidth="{TemplateBinding MinWidth}"
-						ColumnSpacing="2"
+						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+						VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+						Background="{TemplateBinding Background}"
 						TabFocusNavigation="Once"
 						XYFocusKeyboardNavigation="Enabled">
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="Auto" />
 							<ColumnDefinition Width="Auto" />
 							<ColumnDefinition Width="*" />
+							<ColumnDefinition Width="Auto" />
 						</Grid.ColumnDefinitions>
 
 						<local:BreadcrumbBarItem
@@ -50,6 +63,7 @@
 						<local:BreadcrumbBarItem
 							x:Name="PART_EllipsisBreadcrumbBarItem"
 							Grid.Column="1"
+							Margin="{StaticResource BreadcrumbBarItemMargin}"
 							AutomationProperties.AccessibilityView="Content"
 							IsEllipsis="True"
 							Visibility="Collapsed">
@@ -59,6 +73,8 @@
 						<ItemsRepeater
 							x:Name="PART_MainItemsRepeater"
 							Grid.Column="2"
+							Margin="{StaticResource BreadcrumbBarItemMargin}"
+							HorizontalAlignment="Left"
 							ItemTemplate="{Binding ItemTemplate, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
 							ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
 
@@ -85,17 +101,17 @@
 		<Setter Property="HorizontalAlignment" Value="Stretch" />
 		<Setter Property="HorizontalContentAlignment" Value="Center" />
 		<Setter Property="VerticalAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Stretch" />
 
 		<Setter Property="FocusVisualMargin" Value="1" />
 		<Setter Property="IsTabStop" Value="False" />
 		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="local:BreadcrumbBarItem">
 					<Grid
 						x:Name="PART_LayoutRoot"
-						ColumnSpacing="2"
 						TabFocusNavigation="Once"
 						XYFocusKeyboardNavigation="Enabled">
 						<Grid.ColumnDefinitions>
@@ -107,7 +123,7 @@
 						<Button
 							x:Name="PART_ItemContentButton"
 							Padding="{TemplateBinding Padding}"
-							VerticalAlignment="Stretch"
+							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
 							AutomationProperties.AccessibilityView="Raw"
 							Background="{TemplateBinding Background}"
 							BorderBrush="{TemplateBinding BorderBrush}"
@@ -115,6 +131,13 @@
 							Control.IsTemplateFocusTarget="True"
 							CornerRadius="{TemplateBinding CornerRadius}"
 							UseSystemFocusVisuals="True">
+							<Button.Resources>
+								<ResourceDictionary>
+									<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
+									<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+								</ResourceDictionary>
+							</Button.Resources>
+
 							<FlyoutBase.AttachedFlyout>
 								<MenuFlyout
 									x:Name="PART_ItemEllipsisDropDownMenuFlyout"
@@ -151,8 +174,9 @@
 						<Button
 							x:Name="PART_ItemChevronButton"
 							Grid.Column="1"
+							Margin="{StaticResource BreadcrumbBarItemMargin}"
 							Padding="{StaticResource BreadcrumbBarChevronPadding}"
-							VerticalAlignment="Stretch"
+							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
 							AutomationProperties.AccessibilityView="Content"
 							Background="{TemplateBinding Background}"
 							BorderBrush="{TemplateBinding BorderBrush}"
@@ -160,6 +184,13 @@
 							CornerRadius="{StaticResource BreadcrumbBarChevronCornerRaduis}"
 							Style="{StaticResource BreadcrumbBarItemChevronButtonStyle}"
 							UseSystemFocusVisuals="True">
+							<Button.Resources>
+								<ResourceDictionary>
+									<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
+									<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+								</ResourceDictionary>
+							</Button.Resources>
+
 							<FlyoutBase.AttachedFlyout>
 								<MenuFlyout
 									x:Name="PART_ItemChevronDropDownMenuFlyout"
diff --git a/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarItem.cs b/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarItem.cs
index 626a043b3e1d..f68d369105db 100644
--- a/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarItem.cs
+++ b/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarItem.cs
@@ -55,31 +55,33 @@ protected override void OnApplyTemplate()
 
 		public void OnItemClicked()
 		{
-			if (_ownerRef is not null &&
-				_ownerRef.TryGetTarget(out var breadcrumbBar))
+			if (_ownerRef is null ||
+				!_ownerRef.TryGetTarget(out var breadcrumbBar))
+				return;
+
+			if (IsEllipsis)
 			{
-				if (IsEllipsis)
-				{
-					// Clear items in the ellipsis flyout
-					_itemEllipsisDropDownMenuFlyout.Items.Clear();
+				// Clear items in the ellipsis flyout
+				_itemEllipsisDropDownMenuFlyout.Items.Clear();
 
-					// Populate items in the ellipsis flyout
-					for (int index = 0; index < breadcrumbBar.IndexAfterEllipsis; index++)
+				// Populate items in the ellipsis flyout
+				for (int index = 0; index < breadcrumbBar.IndexAfterEllipsis; index++)
+				{
+					if (breadcrumbBar.TryGetElement(index, out var item) && item?.Content is string text)
 					{
-						if (breadcrumbBar.TryGetElement(index, out var item) && item?.Content is string text)
-						{
-							_itemEllipsisDropDownMenuFlyout.Items.Add(new MenuFlyoutItem() { Text = text });
-						}
+						var menuFlyoutItem = new MenuFlyoutItem() { Text = text };
+						_itemEllipsisDropDownMenuFlyout.Items.Add(menuFlyoutItem);
+						menuFlyoutItem.Click += (sender, e) => breadcrumbBar.RaiseItemClickedEvent(item);
 					}
-
-					// Open the ellipsis flyout
-					FlyoutBase.ShowAttachedFlyout(_itemContentButton);
-				}
-				else
-				{
-					// Fire a click event
-					breadcrumbBar.RaiseItemClickedEvent(this);
 				}
+
+				// Open the ellipsis flyout
+				FlyoutBase.ShowAttachedFlyout(_itemContentButton);
+			}
+			else
+			{
+				// Fire a click event
+				breadcrumbBar.RaiseItemClickedEvent(this);
 			}
 		}
 
diff --git a/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarLayout.cs b/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarLayout.cs
index 09ca8502d4e0..da0313988121 100644
--- a/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarLayout.cs
+++ b/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarLayout.cs
@@ -13,7 +13,6 @@ public partial class BreadcrumbBarLayout : NonVirtualizingLayout
 		// Fields
 
 		private readonly WeakReference<BreadcrumbBar>? _ownerRef;
-		private readonly double _spacing = 0d;
 
 		private Size _availableSize;
 		private BreadcrumbBarItem? _ellipsisButton = null;
@@ -24,10 +23,9 @@ public partial class BreadcrumbBarLayout : NonVirtualizingLayout
 		public int IndexAfterEllipsis { get; private set; }
 		public int VisibleItemsCount { get; private set; }
 
-		public BreadcrumbBarLayout(BreadcrumbBar breadcrumb, double spacing)
+		public BreadcrumbBarLayout(BreadcrumbBar breadcrumb)
 		{
 			_ownerRef = new(breadcrumb);
-			_spacing = spacing;
 		}
 
 		protected override Size MeasureOverride(NonVirtualizingLayoutContext context, Size availableSize)
@@ -79,7 +77,6 @@ protected override Size ArrangeOverride(NonVirtualizingLayoutContext context, Si
 						breadcrumbItem.Arrange(new Rect(accumulatedWidths, 0, breadcrumbItem.DesiredSize.Width, breadcrumbItem.DesiredSize.Height));
 
 						accumulatedWidths += breadcrumbItem.DesiredSize.Width;
-						accumulatedWidths += _spacing;
 
 						VisibleItemsCount++;
 					}
@@ -89,15 +86,17 @@ protected override Size ArrangeOverride(NonVirtualizingLayoutContext context, Si
 			if (_ownerRef?.TryGetTarget(out var breadcrumbBar) ?? false)
 				breadcrumbBar.OnLayoutUpdated();
 
+			finalSize.Width = accumulatedWidths;
+
 			return finalSize;
 		}
 
 		private int GetFirstIndexToRender(NonVirtualizingLayoutContext context)
 		{
 			var itemCount = context.Children.Count;
-			var accumulatedWidth = _spacing;
+			var accumulatedWidth = 0d;
 
-			// Go through all items from the end
+			// Go through all items from the last item
 			for (int index = itemCount - 1; index >= 0; index--)
 			{
 				var newAccumulatedWidth = accumulatedWidth + context.Children[index].DesiredSize.Width;
diff --git a/src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarItemEventArgs.cs b/src/Files.App.Controls/BreadcrumbBar/EventArgs.cs
similarity index 100%
rename from src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarItemEventArgs.cs
rename to src/Files.App.Controls/BreadcrumbBar/EventArgs.cs
diff --git a/src/Files.App.Controls/Omnibar/EventArgs.cs b/src/Files.App.Controls/Omnibar/EventArgs.cs
new file mode 100644
index 000000000000..6f0d5ca518ba
--- /dev/null
+++ b/src/Files.App.Controls/Omnibar/EventArgs.cs
@@ -0,0 +1,11 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+namespace Files.App.Controls
+{
+	public record class OmnibarQuerySubmittedEventArgs(OmnibarMode Mode, object? Item, string Text);
+
+	public record class OmnibarSuggestionChosenEventArgs(OmnibarMode Mode, object SelectedItem);
+
+	public record class OmnibarTextChangedEventArgs(OmnibarMode Mode, OmnibarTextChangeReason Reason);
+}
diff --git a/src/Files.App.Controls/Omnibar/IOmnibarTextMemberPathProvider.cs b/src/Files.App.Controls/Omnibar/IOmnibarTextMemberPathProvider.cs
new file mode 100644
index 000000000000..41f798da7e7f
--- /dev/null
+++ b/src/Files.App.Controls/Omnibar/IOmnibarTextMemberPathProvider.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+namespace Files.App.Controls
+{
+	/// <summary>
+	/// An interface that provides a way to get the text member path of <see cref="OmnibarMode.SuggestionItemsSource"/>.
+	/// </summary>
+	/// <remarks>
+	/// An alternative to this interface is to use an <see cref="Microsoft.UI.Xaml.Data.IBindableCustomPropertyImplementation"/> powered by CsWinRT.
+	/// </remarks>
+	public interface IOmnibarTextMemberPathProvider
+	{
+		/// <summary>
+		/// Retrieves the path of the text member as a string. This path can be used to identify the location of the text member.
+		/// </summary>
+		/// <returns>Returns a string representing the path of the text member.</returns>
+		string GetTextMemberPath(string textMemberPath);
+	}
+}
diff --git a/src/Files.App.Controls/Omnibar/Omnibar.Events.cs b/src/Files.App.Controls/Omnibar/Omnibar.Events.cs
new file mode 100644
index 000000000000..06161def1f95
--- /dev/null
+++ b/src/Files.App.Controls/Omnibar/Omnibar.Events.cs
@@ -0,0 +1,126 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml.Input;
+using Windows.System;
+
+namespace Files.App.Controls
+{
+	public partial class Omnibar
+	{
+		private void Omnibar_SizeChanged(object sender, SizeChangedEventArgs e)
+		{
+			// Popup width has to be set manually because it doesn't stretch with the parent
+			_textBoxSuggestionsContainerBorder.Width = ActualWidth;
+		}
+
+		private void AutoSuggestBox_GotFocus(object sender, RoutedEventArgs e)
+		{
+			_isFocused = true;
+
+			VisualStateManager.GoToState(CurrentSelectedMode, "Focused", true);
+			VisualStateManager.GoToState(_textBox, "InputAreaVisible", true);
+
+			TryToggleIsSuggestionsPopupOpen(true);
+		}
+
+		private void AutoSuggestBox_LostFocus(object sender, RoutedEventArgs e)
+		{
+			// TextBox still has focus if the context menu for selected text is open
+			if (_textBox.ContextFlyout.IsOpen)
+				return;
+
+			_isFocused = false;
+
+			if (CurrentSelectedMode?.ContentOnInactive is not null)
+			{
+				VisualStateManager.GoToState(CurrentSelectedMode, "CurrentUnfocused", true);
+				VisualStateManager.GoToState(_textBox, "InputAreaCollapsed", true);
+			}
+
+			TryToggleIsSuggestionsPopupOpen(false);
+		}
+
+		private void AutoSuggestBox_KeyDown(object sender, KeyRoutedEventArgs e)
+		{
+			if (e.Key is VirtualKey.Enter)
+			{
+				e.Handled = true;
+
+				SubmitQuery(_textBoxSuggestionsPopup.IsOpen && _textBoxSuggestionsListView.SelectedIndex is not -1 ? _textBoxSuggestionsListView.SelectedItem : null);
+			}
+			else if ((e.Key == VirtualKey.Up || e.Key == VirtualKey.Down) && _textBoxSuggestionsPopup.IsOpen)
+			{
+				e.Handled = true;
+
+				var currentIndex = _textBoxSuggestionsListView.SelectedIndex;
+				var nextIndex = currentIndex;
+				var suggestionsCount = _textBoxSuggestionsListView.Items.Count;
+
+				if (e.Key is VirtualKey.Up)
+				{
+					nextIndex--;
+				}
+				else if (e.Key is VirtualKey.Down)
+				{
+					nextIndex++;
+				}
+
+				if (0 > nextIndex || nextIndex >= suggestionsCount)
+				{
+					RevertTextToUserInput();
+				}
+				else
+				{
+					_textBoxSuggestionsListView.SelectedIndex = nextIndex;
+
+					ChooseSuggestionItem(_textBoxSuggestionsListView.SelectedItem);
+				}
+			}
+			else if (e.Key == VirtualKey.Escape && _textBoxSuggestionsPopup.IsOpen)
+			{
+				e.Handled = true;
+
+				RevertTextToUserInput();
+				_textBoxSuggestionsPopup.IsOpen = false;
+			}
+			else
+			{
+				_textChangeReason = OmnibarTextChangeReason.UserInput;
+			}
+		}
+
+		private void AutoSuggestBox_TextChanged(object sender, TextChangedEventArgs e)
+		{
+			CurrentSelectedMode!.Text = _textBox.Text;
+
+			// UpdateSuggestionListView();
+
+			if (_textChangeReason is not OmnibarTextChangeReason.SuggestionChosen and
+				not OmnibarTextChangeReason.ProgrammaticChange)
+			{
+				_textChangeReason = OmnibarTextChangeReason.UserInput;
+				_userInput = _textBox.Text;
+			}
+
+			TextChanged?.Invoke(this, new(CurrentSelectedMode, _textChangeReason));
+
+			// Reset
+			_textChangeReason = OmnibarTextChangeReason.None;
+		}
+
+		private void AutoSuggestBoxSuggestionsPopup_GettingFocus(UIElement sender, GettingFocusEventArgs args)
+		{
+			args.TryCancel();
+		}
+
+		private void AutoSuggestBoxSuggestionsListView_ItemClick(object sender, ItemClickEventArgs e)
+		{
+			if (CurrentSelectedMode is null)
+				return;
+
+			ChooseSuggestionItem(e.ClickedItem);
+			SubmitQuery(e.ClickedItem);
+		}
+	}
+}
diff --git a/src/Files.App.Controls/Omnibar/Omnibar.Properties.cs b/src/Files.App.Controls/Omnibar/Omnibar.Properties.cs
index 063c45909bd1..e530e55e69fd 100644
--- a/src/Files.App.Controls/Omnibar/Omnibar.Properties.cs
+++ b/src/Files.App.Controls/Omnibar/Omnibar.Properties.cs
@@ -2,13 +2,6 @@
 // Licensed under the MIT License.
 
 using CommunityToolkit.WinUI;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Markup;
-using Microsoft.UI.Xaml.Shapes;
-using System.Linq;
-using System.Collections.Generic;
 
 namespace Files.App.Controls
 {
@@ -19,5 +12,8 @@ public partial class Omnibar
 
 		[GeneratedDependencyProperty]
 		public partial OmnibarMode? CurrentSelectedMode { get; set; }
+
+		[GeneratedDependencyProperty]
+		public partial Thickness AutoSuggestBoxPadding { get; set; }
 	}
 }
diff --git a/src/Files.App.Controls/Omnibar/Omnibar.cs b/src/Files.App.Controls/Omnibar/Omnibar.cs
index caaae18cf855..9f3d5fae3710 100644
--- a/src/Files.App.Controls/Omnibar/Omnibar.cs
+++ b/src/Files.App.Controls/Omnibar/Omnibar.cs
@@ -1,59 +1,88 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using CommunityToolkit.WinUI;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Markup;
-using Microsoft.UI.Xaml.Shapes;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI;
-using Windows.ApplicationModel.Contacts;
+using Microsoft.UI.Xaml.Media.Animation;
+using Windows.Foundation;
 
 namespace Files.App.Controls
 {
 	// Content
 	[ContentProperty(Name = nameof(Modes))]
-	// Template parts
-	[TemplatePart(Name = "PART_ModesHostGrid", Type = typeof(Grid))]
-	// Visual states
-	[TemplateVisualState(Name = "Focused", GroupName = "FocusStates")]
-	[TemplateVisualState(Name = "Normal", GroupName = "FocusStates")]
 	public partial class Omnibar : Control
 	{
-		private const string ModesHostGrid = "PART_ModesHostGrid";
-		private const string AutoSuggestPopup = "PART_AutoSuggestPopup";
-		private const string AutoSuggestBoxBorder = "PART_AutoSuggestBoxBorder";
+		// Constants
+
+		private const string TemplatePartName_AutoSuggestBox = "PART_TextBox";
+		private const string TemplatePartName_ModesHostGrid = "PART_ModesHostGrid";
+		private const string TemplatePartName_AutoSuggestBoxSuggestionsPopup = "PART_SuggestionsPopup";
+		private const string TemplatePartName_AutoSuggestBoxSuggestionsContainerBorder = "PART_SuggestionsContainerBorder";
+		private const string TemplatePartName_SuggestionsListView = "PART_SuggestionsListView";
+
+		// Fields
+
+		private TextBox _textBox = null!;
+		private Grid _modesHostGrid = null!;
+		private Popup _textBoxSuggestionsPopup = null!;
+		private Border _textBoxSuggestionsContainerBorder = null!;
+		private ListView _textBoxSuggestionsListView = null!;
 
-		private Grid? _modesHostGrid;
-		private Popup? _autoSuggestPopup;
-		private Border? _autoSuggestBoxBorder;
 		private bool _isFocused;
-		private bool _stillHasFocus;
+		private string _userInput = string.Empty;
+		private OmnibarTextChangeReason _textChangeReason = OmnibarTextChangeReason.None;
+
+		// Events
+
+		public event TypedEventHandler<Omnibar, OmnibarQuerySubmittedEventArgs>? QuerySubmitted;
+		public event TypedEventHandler<Omnibar, OmnibarSuggestionChosenEventArgs>? SuggestionChosen;
+		public event TypedEventHandler<Omnibar, OmnibarTextChangedEventArgs>? TextChanged;
+
+		// Constructor
 
 		public Omnibar()
 		{
 			DefaultStyleKey = typeof(Omnibar);
 
-			Modes ??= [];
+			Modes = [];
+			AutoSuggestBoxPadding = new(0, 0, 0, 0);
 		}
 
+		// Methods
+
 		protected override void OnApplyTemplate()
 		{
-			_modesHostGrid = GetTemplateChild(ModesHostGrid) as Grid
-				?? throw new MissingFieldException($"Could not find {ModesHostGrid} in the given {nameof(Omnibar)}'s style.");
-			_autoSuggestPopup = GetTemplateChild(AutoSuggestPopup) as Popup
-				?? throw new MissingFieldException($"Could not find {AutoSuggestPopup} in the given {nameof(Omnibar)}'s style.");
-			_autoSuggestBoxBorder = GetTemplateChild(AutoSuggestBoxBorder) as Border
-				?? throw new MissingFieldException($"Could not find {AutoSuggestBoxBorder} in the given {nameof(Omnibar)}'s style.");
-
-			if (Modes is null)
-				return;
+			base.OnApplyTemplate();
 
-			// Add shadow to the popup and set the proper width
-			_autoSuggestBoxBorder!.Translation = new(0, 0, 32);
-			_autoSuggestBoxBorder!.Width = _modesHostGrid!.ActualWidth;
+			_textBox = GetTemplateChild(TemplatePartName_AutoSuggestBox) as TextBox
+				?? throw new MissingFieldException($"Could not find {TemplatePartName_AutoSuggestBox} in the given {nameof(Omnibar)}'s style.");
+			_modesHostGrid = GetTemplateChild(TemplatePartName_ModesHostGrid) as Grid
+				?? throw new MissingFieldException($"Could not find {TemplatePartName_ModesHostGrid} in the given {nameof(Omnibar)}'s style.");
+			_textBoxSuggestionsPopup = GetTemplateChild(TemplatePartName_AutoSuggestBoxSuggestionsPopup) as Popup
+				?? throw new MissingFieldException($"Could not find {TemplatePartName_AutoSuggestBoxSuggestionsPopup} in the given {nameof(Omnibar)}'s style.");
+			_textBoxSuggestionsContainerBorder = GetTemplateChild(TemplatePartName_AutoSuggestBoxSuggestionsContainerBorder) as Border
+				?? throw new MissingFieldException($"Could not find {TemplatePartName_AutoSuggestBoxSuggestionsContainerBorder} in the given {nameof(Omnibar)}'s style.");
+			_textBoxSuggestionsListView = GetTemplateChild(TemplatePartName_SuggestionsListView) as ListView
+				?? throw new MissingFieldException($"Could not find {TemplatePartName_SuggestionsListView} in the given {nameof(Omnibar)}'s style.");
+
+			PopulateModes();
+
+			SizeChanged += Omnibar_SizeChanged;
+			_textBox.GotFocus += AutoSuggestBox_GotFocus;
+			_textBox.LostFocus += AutoSuggestBox_LostFocus;
+			_textBox.KeyDown += AutoSuggestBox_KeyDown;
+			_textBox.TextChanged += AutoSuggestBox_TextChanged;
+			_textBoxSuggestionsPopup.GettingFocus += AutoSuggestBoxSuggestionsPopup_GettingFocus;
+			_textBoxSuggestionsListView.ItemClick += AutoSuggestBoxSuggestionsListView_ItemClick;
+
+			// Set the default width
+			_textBoxSuggestionsContainerBorder.Width = ActualWidth;
+		}
+
+		public void PopulateModes()
+		{
+			if (Modes is null || _modesHostGrid is null)
+				return;
 
 			// Populate the modes
 			foreach (var mode in Modes)
@@ -61,13 +90,7 @@ protected override void OnApplyTemplate()
 				// Insert a divider
 				if (_modesHostGrid.Children.Count is not 0)
 				{
-					var divider = new Rectangle()
-					{
-						Fill = (SolidColorBrush)Application.Current.Resources["DividerStrokeColorDefaultBrush"],
-						Height = 20,
-						Margin = new(2,0,2,0),
-						Width = 1,
-					};
+					var divider = new OmnibarModeSeparator();
 
 					_modesHostGrid.ColumnDefinitions.Add(new() { Width = GridLength.Auto });
 					Grid.SetColumn(divider, _modesHostGrid.Children.Count);
@@ -78,103 +101,154 @@ protected override void OnApplyTemplate()
 				_modesHostGrid.ColumnDefinitions.Add(new() { Width = GridLength.Auto });
 				Grid.SetColumn(mode, _modesHostGrid.Children.Count);
 				_modesHostGrid.Children.Add(mode);
-				mode.Host = this;
+				mode.SetOwner(this);
 			}
+		}
 
-			_modesHostGrid.SizeChanged += ModesHostGrid_SizeChanged;
-
-			GotFocus += Omnibar_GotFocus;
-			LostFocus += Omnibar_LostFocus;
-			LosingFocus += Omnibar_LosingFocus;
+		public void ChangeMode(OmnibarMode modeToExpand, bool shouldFocus = false, bool useTransition = true)
+		{
+			if (_modesHostGrid is null || Modes is null)
+				return;
 
-			UpdateVisualStates();
+			foreach (var mode in Modes)
+			{
+				// Add the reposition transition to the all modes
+				if (useTransition)
+				{
+					mode.Transitions = [new RepositionThemeTransition()];
+					mode.UpdateLayout();
+				}
 
-			base.OnApplyTemplate();
-		}
+				mode.OnChangingCurrentMode(false);
+			}
 
-		// Methods
+			var index = _modesHostGrid.Children.IndexOf(modeToExpand);
 
-		internal void ChangeMode(OmnibarMode modeToExpand)
-		{
-			if (_modesHostGrid is null || Modes is null)
-				throw new NullReferenceException();
+			if (CurrentSelectedMode is not null)
+				VisualStateManager.GoToState(CurrentSelectedMode, "Unfocused", true);
 
 			// Reset
 			foreach (var column in _modesHostGrid.ColumnDefinitions)
 				column.Width = GridLength.Auto;
-			foreach (var mode in Modes)
-				VisualStateManager.GoToState(mode, "Unfocused", true);
 
 			// Expand the given mode
-			VisualStateManager.GoToState(modeToExpand, "Focused", true);
-			_modesHostGrid.ColumnDefinitions[_modesHostGrid.Children.IndexOf(modeToExpand)].Width = new(1, GridUnitType.Star);
+			_modesHostGrid.ColumnDefinitions[index].Width = new(1, GridUnitType.Star);
+
+			var itemCount = Modes.Count;
+			var itemIndex = Modes.IndexOf(modeToExpand);
+			var modeButtonWidth = modeToExpand.ActualWidth;
+			var modeSeparatorWidth = itemCount is not 0 or 1 ? _modesHostGrid.Children[1] is FrameworkElement frameworkElement ? frameworkElement.ActualWidth : 0 : 0;
+
+			var leftPadding = (itemIndex + 1) * modeButtonWidth + modeSeparatorWidth * itemIndex;
+			var rightPadding = (itemCount - itemIndex - 1) * modeButtonWidth + modeSeparatorWidth * (itemCount - itemIndex - 1) + 8;
+
+			// Set the correct AutoSuggestBox cursor position
+			AutoSuggestBoxPadding = new(leftPadding, 0, rightPadding, 0);
 
 			CurrentSelectedMode = modeToExpand;
 
-			UpdateVisualStates();
-		}
+			_textChangeReason = OmnibarTextChangeReason.ProgrammaticChange;
+			_textBox.Text = CurrentSelectedMode.Text ?? string.Empty;
 
-		private void UpdateVisualStates()
-		{
-			VisualStateManager.GoToState(this, _isFocused ? "Focused" : "Normal", true);
+			// Move cursor of the TextBox to the tail
+			_textBox.Select(_textBox.Text.Length, 0);
 
-			if (CurrentSelectedMode is not null && _autoSuggestPopup is not null)
-			{
-				// Close anyway
-				if (_autoSuggestPopup.IsOpen && CurrentSelectedMode.SuggestionItemsSource is null)
-					VisualStateManager.GoToState(this, "PopupClosed", true);
+			VisualStateManager.GoToState(CurrentSelectedMode, "Focused", true);
+			CurrentSelectedMode.OnChangingCurrentMode(true);
 
-				// Decide open or close
-				if (_isFocused != _autoSuggestPopup.IsOpen)
-					VisualStateManager.GoToState(this, _isFocused && CurrentSelectedMode.SuggestionItemsSource is not null ? "PopupOpened" : "PopupClosed", true);
+			if (_isFocused)
+			{
+				VisualStateManager.GoToState(CurrentSelectedMode, "Focused", true);
+				VisualStateManager.GoToState(_textBox, "InputAreaVisible", true);
+			}
+			else if (CurrentSelectedMode?.ContentOnInactive is not null)
+			{
+				VisualStateManager.GoToState(CurrentSelectedMode, "CurrentUnfocused", true);
+				VisualStateManager.GoToState(_textBox, "InputAreaCollapsed", true);
+			}
+			else
+			{
+				VisualStateManager.GoToState(_textBox, "InputAreaVisible", true);
 			}
 
-			if (CurrentSelectedMode is not null)
-				VisualStateManager.GoToState(
-					CurrentSelectedMode,
-					_isFocused
-						? "Focused"
-						: CurrentSelectedMode.ContentOnInactive is null
-							? "CurrentUnfocusedWithoutInactiveMode"
-							: "CurrentUnfocusedWithInactiveMode",
-					true);
-		}
+			if (shouldFocus)
+				_textBox.Focus(FocusState.Keyboard);
 
-		// Events
+			TryToggleIsSuggestionsPopupOpen(_isFocused && CurrentSelectedMode?.SuggestionItemsSource is not null);
 
-		private void ModesHostGrid_SizeChanged(object sender, SizeChangedEventArgs e)
-		{
-			_autoSuggestBoxBorder!.Width = _modesHostGrid!.ActualWidth;
+			// Remove the reposition transition from the all modes
+			if (useTransition)
+			{
+				foreach (var mode in Modes)
+				{
+					mode.Transitions.Clear();
+					mode.UpdateLayout();
+				}
+			}
 		}
 
-		private void Omnibar_GotFocus(object sender, RoutedEventArgs e)
+		public bool TryToggleIsSuggestionsPopupOpen(bool wantToOpen)
 		{
-			_isFocused = true;
-			UpdateVisualStates();
+			if (wantToOpen && (!_isFocused || CurrentSelectedMode?.SuggestionItemsSource is null))
+				return false;
+
+			_textBoxSuggestionsPopup.IsOpen = wantToOpen;
+
+			return false;
 		}
 
-		private void Omnibar_LosingFocus(UIElement sender, LosingFocusEventArgs args)
+		public void ChooseSuggestionItem(object obj)
 		{
-			// Ignore when user clicks on the TextBox or the button area of an OmnibarMode, Omnibar still has focus anyway
-			if (args.NewFocusedElement?.GetType() is not { } focusedType ||
-				focusedType == typeof(TextBox) ||
-				focusedType == typeof(OmnibarMode) ||
-				focusedType == typeof(Omnibar))
+			if (CurrentSelectedMode is null)
+				return;
+
+			if (CurrentSelectedMode.UpdateTextOnSelect)
 			{
-				_stillHasFocus = true;
+				_textChangeReason = OmnibarTextChangeReason.SuggestionChosen;
+				_textBox.Text = GetObjectText(obj);
 			}
+
+			SuggestionChosen?.Invoke(this, new(CurrentSelectedMode, obj));
+
+			// Move the cursor to the end of the TextBox
+			_textBox?.Select(_textBox.Text.Length, 0);
 		}
 
-		private void Omnibar_LostFocus(object sender, RoutedEventArgs e)
+		private void SubmitQuery(object? item)
 		{
-			if (_stillHasFocus)
-			{
-				_stillHasFocus = false;
+			if (CurrentSelectedMode is null)
 				return;
-			}
 
-			_isFocused = false;
-			UpdateVisualStates();
+			QuerySubmitted?.Invoke(this, new OmnibarQuerySubmittedEventArgs(CurrentSelectedMode, item, _textBox.Text));
+
+			_textBoxSuggestionsPopup.IsOpen = false;
+		}
+
+		private string GetObjectText(object obj)
+		{
+			if (CurrentSelectedMode is null)
+				return string.Empty;
+
+			// Get the text to put into the text box from the chosen suggestion item
+			return obj is string text
+				? text
+				: obj is IOmnibarTextMemberPathProvider textMemberPathProvider
+					? textMemberPathProvider.GetTextMemberPath(CurrentSelectedMode.DisplayMemberPath ?? string.Empty)
+					: obj.ToString() ?? string.Empty;
+		}
+
+		private void RevertTextToUserInput()
+		{
+			if (CurrentSelectedMode is null)
+				return;
+
+			_textBoxSuggestionsListView.SelectedIndex = -1;
+			_textChangeReason = OmnibarTextChangeReason.ProgrammaticChange;
+
+			_textBox.Text = _userInput ?? "";
+
+			// Move the cursor to the end of the TextBox
+			_textBox?.Select(_textBox.Text.Length, 0);
 		}
 	}
 }
diff --git a/src/Files.App.Controls/Omnibar/Omnibar.xaml b/src/Files.App.Controls/Omnibar/Omnibar.xaml
index e89841dfac45..439ec2674897 100644
--- a/src/Files.App.Controls/Omnibar/Omnibar.xaml
+++ b/src/Files.App.Controls/Omnibar/Omnibar.xaml
@@ -2,104 +2,431 @@
 <ResourceDictionary
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:local="using:Files.App.Controls">
-
-	<!--<ResourceDictionary.ThemeDictionaries>
-		<ResourceDictionary x:Key="Default">
-			<SolidColorBrush x:Key="OmnibarModeDivisiderBrush" Color="{ThemeResource DividerStrokeColorDefaultBrush}" />
-		</ResourceDictionary>
-		<ResourceDictionary x:Key="HighContrast">
-			<SolidColorBrush x:Key="OmnibarModeDivisiderBrush" Color="{ThemeResource DividerStrokeColorDefaultBrush}" />
-		</ResourceDictionary>
-	</ResourceDictionary.ThemeDictionaries>-->
+	xmlns:local="using:Files.App.Controls"
+	xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
 
 	<x:Double x:Key="OmnibarDefaultHeight">38</x:Double>
+	<x:Double x:Key="OmnibarModeDefaultHeight">34</x:Double>
+	<x:Double x:Key="OmnibarModeDefaultClickAreaWidth">46</x:Double>
+	<x:Double x:Key="OmnibarModeSeparatorWidth">1</x:Double>
+	<x:Double x:Key="OmnibarModeSeparatorHeight">20</x:Double>
+
+	<Thickness x:Key="OmnibarBorderThicknessUnfocused">1</Thickness>
+	<Thickness x:Key="OmnibarBorderThicknessFocused">2</Thickness>
+	<Thickness x:Key="OmnibarBorderMarginUnfocused">-1</Thickness>
+	<Thickness x:Key="OmnibarModeSeparatorPadding">4,0,4,0</Thickness>
+
 	<CornerRadius x:Key="OmnibarDefaultCornerRadius">19</CornerRadius>
-	<Thickness x:Key="OmnibarFocusedBorderThickness">2</Thickness>
-	<Thickness x:Key="OmnibarUnfocusedBorderThickness">1</Thickness>
-	<Thickness x:Key="OmnibarUnfocusedRootPadding">1</Thickness>
+	<CornerRadius x:Key="OmnibarModeDefaultCornerRadius">17</CornerRadius>
 
 	<Style BasedOn="{StaticResource DefaultOmnibarStyle}" TargetType="local:Omnibar" />
+	<Style BasedOn="{StaticResource DefaultOmnibarModeStyle}" TargetType="local:OmnibarMode" />
+	<Style BasedOn="{StaticResource DefaultOmnibarModeSeparatorStyle}" TargetType="local:OmnibarModeSeparator" />
 
 	<Style x:Key="DefaultOmnibarStyle" TargetType="local:Omnibar">
-		<Setter Property="IsTabStop" Value="True" />
-		<Setter Property="UseSystemFocusVisuals" Value="True" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
+
 		<Setter Property="Background" Value="{ThemeResource ControlFillColorDefaultBrush}" />
-		<Setter Property="Padding" Value="{StaticResource OmnibarUnfocusedRootPadding}" />
+		<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
 		<Setter Property="BorderBrush" Value="{ThemeResource CircleElevationBorderBrush}" />
-		<Setter Property="BorderThickness" Value="{StaticResource OmnibarUnfocusedBorderThickness}" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="BorderThickness" Value="{StaticResource OmnibarBorderThicknessUnfocused}" />
 		<Setter Property="CornerRadius" Value="{StaticResource OmnibarDefaultCornerRadius}" />
+
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
 		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="IsFocusEngagementEnabled" Value="True" />
+
+		<Setter Property="Height" Value="{StaticResource OmnibarDefaultHeight}" />
+
+		<Setter Property="IsTabStop" Value="False" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="local:Omnibar">
 					<Grid x:Name="PART_RootGrid">
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
-							<RowDefinition Height="Auto" />
+							<RowDefinition Height="*" />
 						</Grid.RowDefinitions>
-						<!--  Input area  -->
-						<Grid
-							x:Name="PART_ModesHostGrid"
+
+						<TextBox
+							x:Name="PART_TextBox"
 							Grid.Row="0"
-							Height="{StaticResource OmnibarDefaultHeight}"
-							Padding="{TemplateBinding Padding}"
+							Width="{TemplateBinding Width}"
+							Height="{TemplateBinding Height}"
+							Padding="{Binding AutoSuggestBoxPadding, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+							HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+							VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
 							Background="{TemplateBinding Background}"
+							BackgroundSizing="{TemplateBinding BackgroundSizing}"
 							BorderBrush="{TemplateBinding BorderBrush}"
 							BorderThickness="{TemplateBinding BorderThickness}"
-							CornerRadius="{TemplateBinding CornerRadius}" />
+							CornerRadius="{TemplateBinding CornerRadius}"
+							DesiredCandidateWindowAlignment="BottomEdge"
+							FontFamily="{TemplateBinding FontFamily}"
+							FontSize="{TemplateBinding FontSize}"
+							FontStretch="{TemplateBinding FontStretch}"
+							FontWeight="{TemplateBinding FontWeight}"
+							Foreground="{TemplateBinding Foreground}"
+							PlaceholderText="{Binding CurrentSelectedMode.PlaceholderText, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+							ScrollViewer.BringIntoViewOnFocusChange="False"
+							Style="{StaticResource DefaultOmnibarTextBoxStyle}"
+							UseSystemFocusVisuals="{TemplateBinding UseSystemFocusVisuals}" />
+
+						<Grid
+							x:Name="PART_ModesHostGrid"
+							Grid.Row="0"
+							Padding="2,0" />
 
-						<!--  Auto-suggest box area  -->
 						<Popup
-							x:Name="PART_AutoSuggestPopup"
+							x:Name="PART_SuggestionsPopup"
 							Grid.Row="1"
-							HorizontalAlignment="Stretch"
-							IsOpen="False"
-							ShouldConstrainToRootBounds="False">
-
+							IsLightDismissEnabled="False"
+							IsTabStop="False"
+							ShouldConstrainToRootBounds="False"
+							VerticalOffset="1">
 							<Border
-								x:Name="PART_AutoSuggestBoxBorder"
-								MaxHeight="200"
-								Background="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}"
-								BorderBrush="{ThemeResource SurfaceStrokeColorFlyoutBrush}"
-								BorderThickness="1"
+								x:Name="PART_SuggestionsContainerBorder"
+								Padding="{ThemeResource AutoSuggestListMargin}"
+								Background="{ThemeResource AutoSuggestBoxSuggestionsListBackground}"
+								BorderBrush="{ThemeResource AutoSuggestBoxSuggestionsListBorderBrush}"
+								BorderThickness="{ThemeResource AutoSuggestListBorderThemeThickness}"
 								CornerRadius="{ThemeResource OverlayCornerRadius}">
-								<Border.Shadow>
-									<ThemeShadow />
-								</Border.Shadow>
-
 								<ListView
-									Padding="0,2"
-									HorizontalAlignment="Stretch"
+									x:Name="PART_SuggestionsListView"
+									MaxHeight="{ThemeResource AutoSuggestListMaxHeight}"
+									Margin="{ThemeResource AutoSuggestListPadding}"
 									IsItemClickEnabled="True"
 									ItemTemplate="{Binding CurrentSelectedMode.SuggestionItemTemplate, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
 									ItemsSource="{Binding CurrentSelectedMode.SuggestionItemsSource, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-									SelectionMode="None" />
-
+									SelectionMode="Single">
+									<ListView.ItemContainerTransitions />
+								</ListView>
 							</Border>
 						</Popup>
 
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style x:Key="DefaultOmnibarModeStyle" TargetType="local:OmnibarMode">
+
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="CornerRadius" Value="{StaticResource OmnibarModeDefaultCornerRadius}" />
+
+		<Setter Property="Height" Value="{StaticResource OmnibarModeDefaultHeight}" />
+
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="VerticalAlignment" Value="Stretch" />
+
+		<Setter Property="IsTabStop" Value="True" />
+		<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="local:OmnibarMode">
+					<Grid
+						x:Name="PART_RootGrid"
+						Height="{TemplateBinding Height}"
+						HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+						Background="{TemplateBinding Background}"
+						CornerRadius="{TemplateBinding CornerRadius}"
+						TabFocusNavigation="Local">
+						<!--  Mode Button  -->
+						<Border
+							x:Name="PART_ModeButton"
+							Width="{StaticResource OmnibarModeDefaultClickAreaWidth}"
+							Height="{TemplateBinding Height}"
+							Background="{TemplateBinding Background}"
+							BorderBrush="{TemplateBinding BorderBrush}"
+							BorderThickness="{TemplateBinding BorderThickness}"
+							CornerRadius="{TemplateBinding CornerRadius}"
+							IsTabStop="True"
+							ToolTipService.ToolTip="{Binding ModeName, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+							UseSystemFocusVisuals="{StaticResource UseSystemFocusVisuals}">
+							<Border.BackgroundTransition>
+								<BrushTransition Duration="0:0:0.083" />
+							</Border.BackgroundTransition>
+
+							<ContentPresenter
+								x:Name="PART_ModeButtonIconPresenter"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								Content="{Binding IconOnInactive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+						</Border>
+
+						<ContentPresenter
+							x:Name="PART_InactiveContent"
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Stretch"
+							HorizontalContentAlignment="Stretch"
+							Content="{Binding ContentOnInactive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+							Visibility="Collapsed" />
+
 						<VisualStateManager.VisualStateGroups>
 
 							<VisualStateGroup x:Name="PointerStates">
+								<VisualState x:Name="PointerNormal" />
+								<VisualState x:Name="PointerOver">
+									<VisualState.Setters>
+										<Setter Target="PART_ModeButton.Background" Value="{ThemeResource SubtleFillColorTertiaryBrush}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="PointerPressed">
+									<VisualState.Setters>
+										<Setter Target="PART_ModeButton.Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
+										<Setter Target="PART_ModeButtonIconPresenter.Content" Value="{Binding IconOnActive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+
+							<VisualStateGroup x:Name="FocusStates">
+								<VisualState x:Name="Unfocused" />
+								<VisualState x:Name="CurrentUnfocused">
+									<VisualState.Setters>
+										<Setter Target="PART_ModeButtonIconPresenter.Visibility" Value="Collapsed" />
+										<Setter Target="PART_InactiveContent.Visibility" Value="Visible" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="Focused">
+									<VisualState.Setters>
+										<Setter Target="PART_ModeButtonIconPresenter.Content" Value="{Binding IconOnActive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+
+						</VisualStateManager.VisualStateGroups>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style x:Key="DefaultOmnibarModeSeparatorStyle" TargetType="local:OmnibarModeSeparator">
+
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+
+		<Setter Property="Height" Value="{StaticResource OmnibarModeDefaultHeight}" />
+		<Setter Property="Padding" Value="{StaticResource OmnibarModeSeparatorPadding}" />
+
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="VerticalAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Stretch" />
+
+		<Setter Property="IsTabStop" Value="False" />
+
+		<Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
+
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="local:OmnibarModeSeparator">
+					<Grid
+						x:Name="PART_RootGrid"
+						Height="{TemplateBinding Height}"
+						Padding="{TemplateBinding Padding}"
+						Background="{TemplateBinding Background}"
+						BorderBrush="{TemplateBinding BorderBrush}">
+
+						<Rectangle
+							Width="{StaticResource OmnibarModeSeparatorWidth}"
+							Height="{StaticResource OmnibarModeSeparatorHeight}"
+							Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
+
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+
+	<Style
+		x:Key="DefaultOmnibarTextBoxStyle"
+		BasedOn="{StaticResource AutoSuggestBoxTextBoxStyle}"
+		TargetType="TextBox">
+
+		<Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
+		<Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
+		<Setter Property="BorderBrush" Value="{ThemeResource TextControlBorderBrush}" />
+		<Setter Property="BorderThickness" Value="{ThemeResource TextControlBorderThemeThickness}" />
+
+		<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+		<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+		<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+
+		<Setter Property="MinHeight" Value="{ThemeResource TextControlThemeMinHeight}" />
+		<Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}" />
+		<Setter Property="Padding" Value="{ThemeResource TextControlThemePadding}" />
+
+		<Setter Property="UseSystemFocusVisuals" Value="{ThemeResource IsApplicationFocusVisualKindReveal}" />
+
+		<Setter Property="SelectionHighlightColor" Value="{ThemeResource TextControlSelectionHighlightColor}" />
+		<Setter Property="ContextFlyout" Value="{StaticResource TextControlCommandBarContextFlyout}" />
+		<Setter Property="SelectionFlyout" Value="{StaticResource TextControlCommandBarSelectionFlyout}" />
+
+		<Setter Property="ScrollViewer.HorizontalScrollMode" Value="Auto" />
+		<Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
+		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+		<Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
+
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="TextBox">
+					<Grid>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="*" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+
+						<!--  Header  -->
+						<ContentPresenter
+							x:Name="HeaderContentPresenter"
+							Grid.Row="0"
+							Margin="{ThemeResource TextBoxTopHeaderMargin}"
+							VerticalAlignment="Top"
+							x:DeferLoadStrategy="Lazy"
+							Content="{TemplateBinding Header}"
+							ContentTemplate="{TemplateBinding HeaderTemplate}"
+							FontWeight="Normal"
+							Foreground="{ThemeResource TextControlHeaderForeground}"
+							TextWrapping="Wrap"
+							Visibility="Collapsed" />
+
+						<!--  Control Border  -->
+						<Border
+							x:Name="BorderElement"
+							Grid.Row="1"
+							MinWidth="{TemplateBinding MinWidth}"
+							MinHeight="{TemplateBinding MinHeight}"
+							Background="{TemplateBinding Background}"
+							BackgroundSizing="{TemplateBinding BackgroundSizing}"
+							BorderBrush="{TemplateBinding BorderBrush}"
+							BorderThickness="{TemplateBinding BorderThickness}"
+							Control.IsTemplateFocusTarget="True"
+							CornerRadius="{TemplateBinding CornerRadius}" />
+
+						<!--  Text Input (+ Placeholder Text) & Delete Button  -->
+						<Grid
+							x:Name="PART_TextBoxInputArea"
+							Grid.Row="1"
+							Margin="{TemplateBinding BorderThickness}"
+							Padding="{TemplateBinding Padding}"
+							IsTabStop="False"
+							Visibility="Visible">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+
+							<!--  Text Input  -->
+							<ScrollViewer
+								x:Name="ContentElement"
+								Grid.Column="0"
+								VerticalAlignment="Center"
+								AutomationProperties.AccessibilityView="Raw"
+								Foreground="{TemplateBinding Foreground}"
+								HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+								HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+								IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+								IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
+								IsTabStop="False"
+								IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
+								VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+								VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+								ZoomMode="Disabled" />
+
+							<!--  Placeholder Text  -->
+							<TextBlock
+								x:Name="PlaceholderTextContentPresenter"
+								VerticalAlignment="Center"
+								Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForeground}}"
+								IsHitTestVisible="False"
+								Text="{TemplateBinding PlaceholderText}"
+								TextAlignment="{TemplateBinding TextAlignment}"
+								TextWrapping="{TemplateBinding TextWrapping}" />
+
+							<!--  Delete Button  -->
+							<Button
+								x:Name="DeleteButton"
+								Grid.Column="1"
+								Width="36"
+								Height="28"
+								Padding="0"
+								VerticalAlignment="Center"
+								AutomationProperties.AccessibilityView="Raw"
+								Background="Transparent"
+								BorderThickness="0"
+								Content="&#xE894;"
+								CornerRadius="{StaticResource ControlCornerRadius}"
+								FontFamily="{ThemeResource SymbolThemeFontFamily}"
+								FontSize="{StaticResource TextBoxIconFontSize}"
+								Foreground="{ThemeResource TextControlButtonForeground}"
+								IsTabStop="False"
+								Visibility="Collapsed" />
+						</Grid>
+
+						<!--  Description  -->
+						<ContentPresenter
+							x:Name="DescriptionPresenter"
+							Grid.Row="2"
+							x:Load="False"
+							AutomationProperties.AccessibilityView="Raw"
+							Content="{TemplateBinding Description}"
+							Foreground="{ThemeResource SystemControlDescriptionTextForegroundBrush}" />
+
+						<VisualStateManager.VisualStateGroups>
+
+							<VisualStateGroup x:Name="CommonStates">
 								<VisualState x:Name="Normal" />
+								<VisualState x:Name="Disabled">
+									<VisualState.Setters>
+										<Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForegroundDisabled}}" />
+										<Setter Target="HeaderContentPresenter.Foreground" Value="{ThemeResource TextControlHeaderForegroundDisabled}" />
+										<Setter Target="BorderElement.Background" Value="{ThemeResource TextControlBackgroundDisabled}" />
+										<Setter Target="BorderElement.BorderBrush" Value="{ThemeResource TextControlBorderBrushDisabled}" />
+										<Setter Target="ContentElement.Foreground" Value="{ThemeResource TextControlForegroundDisabled}" />
+									</VisualState.Setters>
+								</VisualState>
+								<VisualState x:Name="PointerOver">
+									<VisualState.Setters>
+										<Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForegroundPointerOver}}" />
+										<Setter Target="HeaderContentPresenter.Foreground" Value="{ThemeResource TextControlHeaderForegroundDisabled}" />
+										<Setter Target="BorderElement.Background" Value="{ThemeResource TextControlBackgroundPointerOver}" />
+										<Setter Target="BorderElement.BorderBrush" Value="{ThemeResource CircleElevationBorderBrush}" />
+										<Setter Target="ContentElement.Foreground" Value="{ThemeResource TextControlForegroundPointerOver}" />
+									</VisualState.Setters>
+								</VisualState>
 								<VisualState x:Name="Focused">
 									<VisualState.Setters>
-										<Setter Target="PART_ModesHostGrid.Margin" Value="-1" />
-										<Setter Target="PART_ModesHostGrid.BorderThickness" Value="{StaticResource OmnibarFocusedBorderThickness}" />
-										<Setter Target="PART_ModesHostGrid.BorderBrush" Value="{ThemeResource AccentFillColorDefaultBrush}" />
+										<Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForegroundFocused}}" />
+										<Setter Target="BorderElement.Background" Value="{ThemeResource TextControlBackgroundFocused}" />
+										<Setter Target="BorderElement.BorderBrush" Value="{ThemeResource AccentFillColorDefaultBrush}" />
+										<Setter Target="BorderElement.BorderThickness" Value="{ThemeResource OmnibarBorderThicknessFocused}" />
+										<Setter Target="BorderElement.Margin" Value="{StaticResource OmnibarBorderMarginUnfocused}" />
+										<Setter Target="ContentElement.Foreground" Value="{ThemeResource TextControlForegroundFocused}" />
+									</VisualState.Setters>
+								</VisualState>
+							</VisualStateGroup>
+
+							<VisualStateGroup x:Name="ButtonStates">
+								<VisualState x:Name="ButtonCollapsed" />
+								<VisualState x:Name="ButtonVisible">
+									<VisualState.Setters>
+										<Setter Target="DeleteButton.Visibility" Value="Visible" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
 
-							<VisualStateGroup x:Name="PopupVisibilityStates">
-								<VisualState x:Name="PopupClosed" />
-								<VisualState x:Name="PopupOpened">
+							<VisualStateGroup x:Name="InputAreaVisibilityStates">
+								<VisualState x:Name="InputAreaVisible" />
+								<VisualState x:Name="InputAreaCollapsed">
 									<VisualState.Setters>
-										<Setter Target="PART_AutoSuggestPopup.IsOpen" Value="True" />
+										<Setter Target="PART_TextBoxInputArea.Visibility" Value="Collapsed" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
diff --git a/src/Files.App.Controls/Omnibar/OmnibarMode.Events.cs b/src/Files.App.Controls/Omnibar/OmnibarMode.Events.cs
new file mode 100644
index 000000000000..cf0be5627114
--- /dev/null
+++ b/src/Files.App.Controls/Omnibar/OmnibarMode.Events.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml.Input;
+
+namespace Files.App.Controls
+{
+	public partial class OmnibarMode
+	{
+		private void ModeButton_PointerEntered(object sender, PointerRoutedEventArgs e)
+		{
+			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)
+				return;
+
+			VisualStateManager.GoToState(this, "PointerOver", true);
+		}
+
+		private void ModeButton_PointerPressed(object sender, PointerRoutedEventArgs e)
+		{
+			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)
+				return;
+
+			VisualStateManager.GoToState(this, "PointerPressed", true);
+		}
+
+		private void ModeButton_PointerReleased(object sender, PointerRoutedEventArgs e)
+		{
+			if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)
+				return;
+
+			VisualStateManager.GoToState(this, "PointerOver", true);
+
+			// Change the current mode
+			owner.ChangeMode(this);
+		}
+
+		private void ModeButton_PointerExited(object sender, PointerRoutedEventArgs e)
+		{
+			VisualStateManager.GoToState(this, "PointerNormal", true);
+		}
+	}
+}
diff --git a/src/Files.App.Controls/Omnibar/OmnibarMode.Properties.cs b/src/Files.App.Controls/Omnibar/OmnibarMode.Properties.cs
index aff5a6397038..c80321b91004 100644
--- a/src/Files.App.Controls/Omnibar/OmnibarMode.Properties.cs
+++ b/src/Files.App.Controls/Omnibar/OmnibarMode.Properties.cs
@@ -2,13 +2,6 @@
 // Licensed under the MIT License.
 
 using CommunityToolkit.WinUI;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Markup;
-using Microsoft.UI.Xaml.Shapes;
-using System.Linq;
-using System.Collections.Generic;
 
 namespace Files.App.Controls
 {
@@ -18,7 +11,10 @@ public partial class OmnibarMode
 		public partial string? Text { get; set; }
 
 		[GeneratedDependencyProperty]
-		public partial string? TextPlaceholder { get; set; }
+		public partial bool IsDefault { get; set; }
+
+		[GeneratedDependencyProperty]
+		public partial string? PlaceholderText { get; set; }
 
 		[GeneratedDependencyProperty]
 		public partial string? ModeName { get; set; }
@@ -39,9 +35,9 @@ public partial class OmnibarMode
 		public partial DataTemplate? SuggestionItemTemplate { get; set; }
 
 		[GeneratedDependencyProperty]
-		public partial bool IsDefault { get; set; }
+		public partial string? DisplayMemberPath { get; set; }
 
-		[GeneratedDependencyProperty]
-		internal partial Omnibar? Host { get; set; }
+		[GeneratedDependencyProperty(DefaultValue = true)]
+		public partial bool UpdateTextOnSelect { get; set; }
 	}
 }
diff --git a/src/Files.App.Controls/Omnibar/OmnibarMode.cs b/src/Files.App.Controls/Omnibar/OmnibarMode.cs
index 2c4c1da64288..3fa09c416018 100644
--- a/src/Files.App.Controls/Omnibar/OmnibarMode.cs
+++ b/src/Files.App.Controls/Omnibar/OmnibarMode.cs
@@ -1,116 +1,90 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Markup;
-using Microsoft.UI.Xaml.Shapes;
 
 namespace Files.App.Controls
 {
-	// Template parts
-	[TemplatePart(Name = "PART_ModeClickBorder", Type = typeof(Border))]
-	[TemplatePart(Name = "PART_ModeIconPresenter", Type = typeof(ContentPresenter))]
-	[TemplatePart(Name = "PART_InputTextBox", Type = typeof(TextBox))]
-	// Visual states
-	[TemplateVisualState(GroupName = "CommonStates", Name = "PointerNormal")]
-	[TemplateVisualState(GroupName = "CommonStates", Name = "PointerOver")]
-	[TemplateVisualState(GroupName = "CommonStates", Name = "PointerPressed")]
-	[TemplateVisualState(GroupName = "CommonStates", Name = "Focused")]
-	[TemplateVisualState(GroupName = "InputVisibilityStates", Name = "Collapsed")]
-	[TemplateVisualState(GroupName = "InputVisibilityStates", Name = "Visible")]
-	[TemplateVisualState(GroupName = "IconStates", Name = "InactiveIcon")]
-	[TemplateVisualState(GroupName = "IconStates", Name = "ActiveIcon")]
+	[DebuggerDisplay("{" + nameof(ToString) + "(),nq}")]
 	public partial class OmnibarMode : Control
 	{
-		private const string ModeClickBorder = "PART_ModeClickBorder";
-		private const string InputTextBox = "PART_InputTextBox";
+		// Constants
 
-		private Border? _modeClickArea;
-		private TextBox? _inputTextBox;
+		private const string TemplatePartName_ModeButton = "PART_ModeButton";
 
-		private bool _isHoveredOver;
-		private bool _isPressed;
+		// Fields
+
+		private WeakReference<Omnibar>? _ownerRef;
+
+		private Border _modeButton = null!;
+
+		// Constructor
 
 		public OmnibarMode()
 		{
 			DefaultStyleKey = typeof(OmnibarMode);
 		}
 
+		// Methods
+
 		protected override void OnApplyTemplate()
 		{
-			_modeClickArea = GetTemplateChild(ModeClickBorder) as Border
-				?? throw new MissingFieldException($"Could not find {ModeClickBorder} in the given {nameof(OmnibarMode)}'s style.");
-			_inputTextBox = GetTemplateChild(InputTextBox) as TextBox
-				?? throw new MissingFieldException($"Could not find {InputTextBox} in the given {nameof(OmnibarMode)}'s style.");
-
-			if (IsDefault)
-				Host!.ChangeMode(this);
-
-			UpdateVisualStates();
-
-			_modeClickArea.PointerEntered += OmnibarMode_PointerEntered;
-			_modeClickArea.PointerPressed += OmnibarMode_PointerPressed;
-			_modeClickArea.PointerReleased += OmnibarMode_PointerReleased;
-			_modeClickArea.PointerExited += OmnibarMode_PointerExited;
-
 			base.OnApplyTemplate();
-		}
 
-		private void UpdateVisualStates()
-		{
-			VisualStateManager.GoToState(
-				this,
-				_isPressed ? "PointerPressed" : _isHoveredOver ? "PointerOver" : "PointerNormal",
-				true);
+			_modeButton = GetTemplateChild(TemplatePartName_ModeButton) as Border
+				?? throw new MissingFieldException($"Could not find {TemplatePartName_ModeButton} in the given {nameof(OmnibarMode)}'s style.");
+			
+			Loaded += OmnibarMode_Loaded;
+			_modeButton.PointerEntered += ModeButton_PointerEntered;
+			_modeButton.PointerPressed += ModeButton_PointerPressed;
+			_modeButton.PointerReleased += ModeButton_PointerReleased;
+			_modeButton.PointerExited += ModeButton_PointerExited;
 		}
 
-		public override string ToString()
+		protected override void OnKeyUp(KeyRoutedEventArgs args)
 		{
-			return ModeName ?? "";
-		}
+			if (args.Handled || IsEnabled is false)
+				goto cleanup;
 
-		// Events
+			if (args.Key is Windows.System.VirtualKey.Enter)
+			{
+				if (_ownerRef is null || _ownerRef.TryGetTarget(out var owner) is false || owner.CurrentSelectedMode == this)
+					return;
 
-		private void OmnibarMode_PointerEntered(object sender, PointerRoutedEventArgs e)
-		{
-			if (Host!.CurrentSelectedMode == this)
-				return;
+				VisualStateManager.GoToState(this, "PointerPressed", true);
+
+				// Change the current mode
+				owner.ChangeMode(this, true);
 
-			_isHoveredOver = true;
-			_isPressed = false;
-			UpdateVisualStates();
+				VisualStateManager.GoToState(this, "PointerNormal", true);
+			}
+
+		cleanup:
+			{
+				base.OnKeyDown(args);
+			}
 		}
 
-		private void OmnibarMode_PointerPressed(object sender, PointerRoutedEventArgs e)
+		private void OmnibarMode_Loaded(object sender, RoutedEventArgs e)
 		{
-			if (Host!.CurrentSelectedMode == this)
-				return;
+			// Set this mode as the current mode if it is the default mode
+			if (IsDefault && _ownerRef is not null && _ownerRef.TryGetTarget(out var owner))
+				owner.ChangeMode(this);
+		}
 
-			_isHoveredOver = false;
-			_isPressed = true;
-			UpdateVisualStates();
+		public void SetOwner(Omnibar owner)
+		{
+			_ownerRef = new(owner);
 		}
 
-		private void OmnibarMode_PointerReleased(object sender, PointerRoutedEventArgs e)
+		public void OnChangingCurrentMode(bool isCurrentMode)
 		{
-			if (Host!.CurrentSelectedMode == this)
-				return;
-
-			_isHoveredOver = true;
-			_isPressed = false;
-			UpdateVisualStates();
-			Host.ChangeMode(this);
-			_inputTextBox?.Focus(FocusState.Pointer);
-			_inputTextBox?.Select(_inputTextBox.Text.Length, 0);
+			_modeButton.IsTabStop = !isCurrentMode;
 		}
 
-		private void OmnibarMode_PointerExited(object sender, PointerRoutedEventArgs e)
+		public override string ToString()
 		{
-			_isHoveredOver = _isPressed = false;
-			UpdateVisualStates();
+			return ModeName ?? string.Empty;
 		}
 	}
 }
diff --git a/src/Files.App.Controls/Omnibar/OmnibarMode.xaml b/src/Files.App.Controls/Omnibar/OmnibarMode.xaml
deleted file mode 100644
index 97509be1f842..000000000000
--- a/src/Files.App.Controls/Omnibar/OmnibarMode.xaml
+++ /dev/null
@@ -1,134 +0,0 @@
-<!--  Copyright (c) Files Community. Licensed under the MIT License.  -->
-<ResourceDictionary
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:local="using:Files.App.Controls">
-
-	<x:Double x:Key="OmnibarModeDefaultHeight">32</x:Double>
-	<x:Double x:Key="OmnibarModeDefaultClickAreaWidth">46</x:Double>
-	<CornerRadius x:Key="OmnibarDefaultCornerRadius">16</CornerRadius>
-
-	<Style BasedOn="{StaticResource DefaultOmnibarModeStyle}" TargetType="local:OmnibarMode" />
-
-	<Style x:Key="DefaultOmnibarModeStyle" TargetType="local:OmnibarMode">
-		<Setter Property="IsTabStop" Value="True" />
-		<Setter Property="Height" Value="{StaticResource OmnibarModeDefaultHeight}" />
-		<Setter Property="UseSystemFocusVisuals" Value="True" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="CornerRadius" Value="{StaticResource OmnibarDefaultCornerRadius}" />
-		<Setter Property="VerticalAlignment" Value="Stretch" />
-		<Setter Property="IsFocusEngagementEnabled" Value="True" />
-		<Setter Property="Transitions">
-			<Setter.Value>
-				<TransitionCollection>
-					<RepositionThemeTransition />
-				</TransitionCollection>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="local:OmnibarMode">
-					<Grid x:Name="PART_RootGrid" Height="{TemplateBinding Height}">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-
-						<Border
-							x:Name="PART_ModeClickBorder"
-							Width="{StaticResource OmnibarModeDefaultClickAreaWidth}"
-							Height="{TemplateBinding Height}"
-							Background="Transparent"
-							CornerRadius="{TemplateBinding CornerRadius}"
-							ToolTipService.ToolTip="{Binding ModeName, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
-							<Border.BackgroundTransition>
-								<BrushTransition Duration="0:0:0.083" />
-							</Border.BackgroundTransition>
-
-							<ContentPresenter
-								x:Name="PART_ModeIconPresenter"
-								HorizontalAlignment="Center"
-								VerticalAlignment="Center"
-								Content="{Binding IconOnInactive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-						</Border>
-
-						<TextBox
-							x:Name="PART_InputTextBox"
-							Grid.Column="1"
-							HorizontalAlignment="Stretch"
-							HorizontalContentAlignment="Stretch"
-							PlaceholderText="{TemplateBinding TextPlaceholder}"
-							Text="{Binding Path=Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-							Visibility="Collapsed">
-							<TextBox.Resources>
-								<SolidColorBrush x:Key="TextControlBackground" Color="Transparent" />
-								<SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="Transparent" />
-								<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="Transparent" />
-								<SolidColorBrush x:Key="TextControlBackgroundDisabled" Color="Transparent" />
-
-								<SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
-								<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
-								<SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="Transparent" />
-								<SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="Transparent" />
-
-								<Thickness x:Key="TextControlThemePadding">0,5,0,6</Thickness>
-							</TextBox.Resources>
-						</TextBox>
-
-						<ContentPresenter
-							x:Name="PART_InactiveContent"
-							Grid.Column="0"
-							Grid.ColumnSpan="2"
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Stretch"
-							HorizontalContentAlignment="Stretch"
-							Content="{Binding ContentOnInactive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-							Visibility="Collapsed" />
-
-						<VisualStateManager.VisualStateGroups>
-
-							<VisualStateGroup x:Name="PointerStates">
-								<VisualState x:Name="PointerNormal" />
-								<VisualState x:Name="PointerOver">
-									<VisualState.Setters>
-										<Setter Target="PART_ModeClickBorder.Background" Value="{ThemeResource SubtleFillColorTertiaryBrush}" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="PointerPressed">
-									<VisualState.Setters>
-										<Setter Target="PART_ModeClickBorder.Background" Value="{ThemeResource SubtleFillColorSecondaryBrush}" />
-										<Setter Target="PART_ModeIconPresenter.Content" Value="{Binding IconOnActive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-
-							<VisualStateGroup x:Name="FocusStates">
-								<VisualState x:Name="Unfocused" />
-								<VisualState x:Name="CurrentUnfocusedWithoutInactiveMode">
-									<VisualState.Setters>
-										<Setter Target="PART_InputTextBox.Visibility" Value="Visible" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="CurrentUnfocusedWithInactiveMode">
-									<VisualState.Setters>
-										<Setter Target="PART_ModeIconPresenter.Visibility" Value="Collapsed" />
-										<Setter Target="PART_InactiveContent.Visibility" Value="Visible" />
-									</VisualState.Setters>
-								</VisualState>
-								<VisualState x:Name="Focused">
-									<VisualState.Setters>
-										<Setter Target="PART_ModeIconPresenter.Content" Value="{Binding IconOnActive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
-										<Setter Target="PART_InputTextBox.Visibility" Value="Visible" />
-									</VisualState.Setters>
-								</VisualState>
-							</VisualStateGroup>
-
-						</VisualStateManager.VisualStateGroups>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-
-</ResourceDictionary>
diff --git a/src/Files.App.Controls/Omnibar/OmnibarModeSeparator.cs b/src/Files.App.Controls/Omnibar/OmnibarModeSeparator.cs
new file mode 100644
index 000000000000..2eaf6fbed8ae
--- /dev/null
+++ b/src/Files.App.Controls/Omnibar/OmnibarModeSeparator.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+namespace Files.App.Controls
+{
+	public partial class OmnibarModeSeparator : Control
+	{
+		// Constructor
+
+		public OmnibarModeSeparator()
+		{
+			DefaultStyleKey = typeof(OmnibarMode);
+		}
+
+		// Methods
+
+		protected override void OnApplyTemplate()
+		{
+			base.OnApplyTemplate();
+		}
+	}
+}
diff --git a/src/Files.App.Controls/Omnibar/OmnibarTextChangeReason.cs b/src/Files.App.Controls/Omnibar/OmnibarTextChangeReason.cs
new file mode 100644
index 000000000000..8a4c41e2b3be
--- /dev/null
+++ b/src/Files.App.Controls/Omnibar/OmnibarTextChangeReason.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+namespace Files.App.Controls
+{
+	public enum OmnibarTextChangeReason
+	{
+		UserInput,
+
+		SuggestionChosen,
+
+		ProgrammaticChange,
+
+		None,
+	}
+}
diff --git a/src/Files.App.Controls/ThemedIcon/ThemedIconMarkup.cs b/src/Files.App.Controls/ThemedIcon/ThemedIconMarkup.cs
new file mode 100644
index 000000000000..23bd9a1342e7
--- /dev/null
+++ b/src/Files.App.Controls/ThemedIcon/ThemedIconMarkup.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Microsoft.UI.Xaml.Markup;
+
+namespace Files.App.Controls
+{
+	[MarkupExtensionReturnType(ReturnType = typeof(ThemedIcon))]
+	public sealed partial class ThemedIconMarkup : MarkupExtension
+	{
+		public Style Style { get; set; } = null!;
+
+		public bool IsFilled { get; set; }
+
+		public ThemedIconTypes IconType { get; set; }
+
+		protected override object ProvideValue()
+		{
+			return new ThemedIcon() { Style = Style, IsFilled = IsFilled, IconType = IconType };
+		}
+	}
+}
diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml
index 4e66b0e77870..910ef94ce52b 100644
--- a/src/Files.App.Controls/Themes/Generic.xaml
+++ b/src/Files.App.Controls/Themes/Generic.xaml
@@ -60,7 +60,6 @@
 
 		<!--#region Omnibar-->
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Omnibar/Omnibar.xaml" />
-		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Omnibar/OmnibarMode.xaml" />
 		<!--#endregion-->
 
 		<!--#region SamplePanel-->
diff --git a/tests/Files.App.UITests/Data/DummyItem2.cs b/tests/Files.App.UITests/Data/BreadcrumbBarItemModel.cs
similarity index 55%
rename from tests/Files.App.UITests/Data/DummyItem2.cs
rename to tests/Files.App.UITests/Data/BreadcrumbBarItemModel.cs
index 048ee1fa236e..9d6169ab1d69 100644
--- a/tests/Files.App.UITests/Data/DummyItem2.cs
+++ b/tests/Files.App.UITests/Data/BreadcrumbBarItemModel.cs
@@ -5,5 +5,5 @@
 
 namespace Files.App.UITests.Data
 {
-	internal record DummyItem2(string Text, ObservableCollection<DummyItem2>? Children = null);
+	internal record BreadcrumbBarItemModel(string Text, ObservableCollection<BreadcrumbBarItemModel>? Children = null);
 }
diff --git a/tests/Files.App.UITests/Data/DummyItem1.cs b/tests/Files.App.UITests/Data/DummyItem1.cs
deleted file mode 100644
index b7cbcc219245..000000000000
--- a/tests/Files.App.UITests/Data/DummyItem1.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) Files Community
-// Licensed under the MIT License.
-
-namespace Files.App.UITests.Data
-{
-	internal record DummyItem1(string Title, string Description, string HotKeys);
-}
diff --git a/tests/Files.App.UITests/Data/OmnibarPaletteSuggestionItem.cs b/tests/Files.App.UITests/Data/OmnibarPaletteSuggestionItem.cs
new file mode 100644
index 000000000000..db6d31d2519d
--- /dev/null
+++ b/tests/Files.App.UITests/Data/OmnibarPaletteSuggestionItem.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Files Community
+// Licensed under the MIT License.
+
+using Files.App.Controls;
+using System;
+
+namespace Files.App.UITests.Data
+{
+	public partial record OmnibarPaletteSuggestionItem(string Title, string Description, string HotKeys)
+		: IOmnibarTextMemberPathProvider
+	{
+		/// <inheritdoc/>
+		public string GetTextMemberPath(string textMemberPath)
+		{
+			return textMemberPath switch
+			{
+				nameof(Title) => Title,
+				nameof(Description) => Description,
+				nameof(HotKeys) => HotKeys,
+				_ => throw new ArgumentOutOfRangeException(nameof(textMemberPath), textMemberPath, null),
+			};
+		}
+	}
+}
diff --git a/tests/Files.App.UITests/Views/BreadcrumbBarPage.xaml b/tests/Files.App.UITests/Views/BreadcrumbBarPage.xaml
index 2044818bbef3..bcff33b8e32f 100644
--- a/tests/Files.App.UITests/Views/BreadcrumbBarPage.xaml
+++ b/tests/Files.App.UITests/Views/BreadcrumbBarPage.xaml
@@ -15,7 +15,7 @@
 		<controls:SamplePanel Header="Default usage">
 			<controls:SamplePanel.MainContent>
 				<Grid
-					Height="36"
+					Height="38"
 					MinWidth="120"
 					Padding="2"
 					HorizontalAlignment="Stretch"
@@ -37,14 +37,8 @@
 								Source="/Data/DummyIcon1.png" />
 						</controls:BreadcrumbBar.RootItem>
 						<controls:BreadcrumbBar.ItemTemplate>
-							<DataTemplate x:DataType="data:DummyItem2">
-								<controls:BreadcrumbBarItem Content="{x:Bind Text}">
-									<!--<controls:BreadcrumbBarItem.ContentTemplate>
-										<DataTemplate>
-											<TextBlock Text="{Binding Text}" TextLineBounds="Tight" />
-										</DataTemplate>
-									</controls:BreadcrumbBarItem.ContentTemplate>-->
-								</controls:BreadcrumbBarItem>
+							<DataTemplate x:DataType="data:BreadcrumbBarItemModel">
+								<controls:BreadcrumbBarItem Content="{x:Bind Text}" />
 							</DataTemplate>
 						</controls:BreadcrumbBar.ItemTemplate>
 					</controls:BreadcrumbBar>
diff --git a/tests/Files.App.UITests/Views/BreadcrumbBarPage.xaml.cs b/tests/Files.App.UITests/Views/BreadcrumbBarPage.xaml.cs
index 32b5cd27c0c1..8b3deb1cc97e 100644
--- a/tests/Files.App.UITests/Views/BreadcrumbBarPage.xaml.cs
+++ b/tests/Files.App.UITests/Views/BreadcrumbBarPage.xaml.cs
@@ -12,7 +12,7 @@ namespace Files.App.UITests.Views
 {
 	public sealed partial class BreadcrumbBarPage : Page
 	{
-		private readonly ObservableCollection<DummyItem2> DummyItems;
+		private readonly ObservableCollection<BreadcrumbBarItemModel> DummyItems;
 
 		[GeneratedDependencyProperty]
 		private partial string? ClickedItemName { get; set; }
diff --git a/tests/Files.App.UITests/Views/OmnibarPage.xaml b/tests/Files.App.UITests/Views/OmnibarPage.xaml
index 43ddf95bbc20..26a4a1604835 100644
--- a/tests/Files.App.UITests/Views/OmnibarPage.xaml
+++ b/tests/Files.App.UITests/Views/OmnibarPage.xaml
@@ -14,189 +14,133 @@
 
 		<controls:SamplePanel Header="Default usage">
 			<controls:SamplePanel.MainContent>
-				<controls:Omnibar x:Name="Omnibar1" IsEnabled="{x:Bind Omnibar1IsEnableToggleSwitch.IsOn, Mode=OneWay}">
+				<Grid>
+					<controls:Omnibar
+						x:Name="Omnibar1"
+						QuerySubmitted="Omnibar1_QuerySubmitted"
+						SuggestionChosen="Omnibar1_SuggestionChosen"
+						TextChanged="Omnibar1_TextChanged">
 
-					<controls:OmnibarMode
-						IsDefault="True"
-						ModeName="Path"
-						Text="Path..."
-						TextPlaceholder="Enter text...">
-						<controls:OmnibarMode.IconOnActive>
-							<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
-						</controls:OmnibarMode.IconOnActive>
-						<controls:OmnibarMode.IconOnInactive>
-							<controls:ThemedIcon IconType="Outline" Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
-						</controls:OmnibarMode.IconOnInactive>
-						<controls:OmnibarMode.ContentOnInactive>
-							<Grid Padding="16,0" ColumnSpacing="16">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition Width="*" />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<Image
-									Grid.Column="0"
-									Width="16"
-									Height="16"
-									Source="/Data/DummyIcon1.png" />
-								<TextBlock
-									Grid.Column="1"
-									VerticalAlignment="Center"
-									Text="Breadcrumb goes here" />
-								<FontIcon
-									Grid.Column="2"
-									FontSize="14"
-									Glyph="&#xe70d;" />
-							</Grid>
-						</controls:OmnibarMode.ContentOnInactive>
-					</controls:OmnibarMode>
+						<controls:OmnibarMode
+							IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IsFilled=True}"
+							IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IconType=Outline}"
+							IsDefault="True"
+							ModeName="Path"
+							PlaceholderText="Enter text..."
+							Text="Path...">
+							<controls:OmnibarMode.ContentOnInactive>
+								<controls:BreadcrumbBar
+									x:Name="BreadcrumbBar1"
+									ItemDropDownFlyoutClosed="Omnibar1_BreadcrumbBar_ItemDropDownFlyoutClosed"
+									ItemDropDownFlyoutOpening="Omnibar1_BreadcrumbBar_ItemDropDownFlyoutOpening"
+									ItemsSource="{x:Bind Omnibar1_BreadcrumbBarItems, Mode=OneWay}">
+									<controls:BreadcrumbBar.RootItem>
+										<Image
+											Width="16"
+											Height="16"
+											Source="/Data/DummyIcon1.png" />
+									</controls:BreadcrumbBar.RootItem>
+									<controls:BreadcrumbBar.ItemTemplate>
+										<DataTemplate x:DataType="data:BreadcrumbBarItemModel">
+											<controls:BreadcrumbBarItem Content="{x:Bind Text}" />
+										</DataTemplate>
+									</controls:BreadcrumbBar.ItemTemplate>
+								</controls:BreadcrumbBar>
+							</controls:OmnibarMode.ContentOnInactive>
+						</controls:OmnibarMode>
 
-					<controls:OmnibarMode
-						ModeName="Palette"
-						SuggestionItemsSource="{x:Bind DummyItems1, Mode=OneWay}"
-						TextPlaceholder="Enter a palette command...">
-						<controls:OmnibarMode.IconOnActive>
-							<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
-						</controls:OmnibarMode.IconOnActive>
-						<controls:OmnibarMode.IconOnInactive>
-							<controls:ThemedIcon IconType="Outline" Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
-						</controls:OmnibarMode.IconOnInactive>
-						<controls:OmnibarMode.SuggestionItemTemplate>
-							<DataTemplate x:DataType="data:DummyItem1">
-								<Grid Height="48" ColumnSpacing="12">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="*" />
-										<ColumnDefinition Width="Auto" />
-									</Grid.ColumnDefinitions>
-									<StackPanel VerticalAlignment="Center">
-										<controls:ThemedIcon IconSize="20" Style="{StaticResource App.ThemedIcons.Actions.Copying}" />
-									</StackPanel>
-									<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>
-								</Grid>
-							</DataTemplate>
-						</controls:OmnibarMode.SuggestionItemTemplate>
-					</controls:OmnibarMode>
+						<controls:OmnibarMode
+							DisplayMemberPath="{x:Bind Omnibar1_TextMemberPathForPaletteMode}"
+							IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IsFilled=True}"
+							IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IconType=Outline}"
+							ModeName="Palette"
+							PlaceholderText="Enter a palette command..."
+							SuggestionItemsSource="{x:Bind Omnibar1_PaletteSuggestions, Mode=OneWay}">
+							<controls:OmnibarMode.SuggestionItemTemplate>
+								<DataTemplate x:DataType="data:OmnibarPaletteSuggestionItem">
+									<Grid Height="48" ColumnSpacing="12">
+										<Grid.ColumnDefinitions>
+											<ColumnDefinition Width="Auto" />
+											<ColumnDefinition Width="*" />
+											<ColumnDefinition Width="Auto" />
+										</Grid.ColumnDefinitions>
+										<controls:ThemedIcon
+											Width="20"
+											Height="20"
+											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>
+									</Grid>
+								</DataTemplate>
+							</controls:OmnibarMode.SuggestionItemTemplate>
+						</controls:OmnibarMode>
 
-					<controls:OmnibarMode ModeName="Search" TextPlaceholder="Enter a search query...">
-						<controls:OmnibarMode.IconOnActive>
-							<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Search}" />
-						</controls:OmnibarMode.IconOnActive>
-						<controls:OmnibarMode.IconOnInactive>
-							<controls:ThemedIcon IconType="Outline" Style="{StaticResource App.ThemedIcons.Omnibar.Search}" />
-						</controls:OmnibarMode.IconOnInactive>
-					</controls:OmnibarMode>
+						<controls:OmnibarMode
+							IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IsFilled=True}"
+							IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IconType=Outline}"
+							ModeName="Search"
+							PlaceholderText="Enter a search query..." />
 
-				</controls:Omnibar>
+					</controls:Omnibar>
+				</Grid>
 			</controls:SamplePanel.MainContent>
 			<controls:SamplePanel.SideContent>
 				<StackPanel Spacing="8">
-					<ToggleSwitch
-						x:Name="Omnibar1IsEnableToggleSwitch"
-						Header="Enable/disable Omnibar:"
-						IsOn="True" />
+
 					<TextBox
-						Header="Current selected mode:"
+						Header="Current mode:"
 						IsReadOnly="True"
 						Text="{x:Bind Omnibar1.CurrentSelectedMode, Mode=OneWay}" />
-				</StackPanel>
-			</controls:SamplePanel.SideContent>
-		</controls:SamplePanel>
-
-		<controls:SamplePanel Header="Custom usage">
-			<controls:SamplePanel.MainContent>
-				<StackPanel Spacing="12">
 
-					<TextBlock Text="Using WinUI font glyphs:" />
+					<TextBox
+						Header="Text:"
+						IsReadOnly="True"
+						Text="{x:Bind Omnibar1_Text, Mode=OneWay}" />
 
-					<controls:Omnibar x:Name="Omnibar2" IsEnabled="{x:Bind Omnibar2IsEnableToggleSwitch.IsOn, Mode=OneWay}">
+					<TextBox
+						Header="Text changed reason:"
+						IsReadOnly="True"
+						Text="{x:Bind Omnibar1_TextChangedReason, Mode=OneWay}" />
 
-						<controls:OmnibarMode
-							IsDefault="True"
-							ModeName="Path"
-							Text="Path..."
-							TextPlaceholder="Enter text...">
-							<controls:OmnibarMode.IconOnActive>
-								<FontIcon FontSize="14" Glyph="&#xE713;" />
-							</controls:OmnibarMode.IconOnActive>
-							<controls:OmnibarMode.IconOnInactive>
-								<FontIcon FontSize="14" Glyph="&#xE713;" />
-							</controls:OmnibarMode.IconOnInactive>
-							<controls:OmnibarMode.ContentOnInactive>
-								<Grid Padding="16,0" ColumnSpacing="16">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="*" />
-										<ColumnDefinition Width="Auto" />
-									</Grid.ColumnDefinitions>
-									<Image
-										Grid.Column="0"
-										Width="16"
-										Height="16"
-										Source="/Data/DummyIcon1.png" />
-									<TextBlock
-										Grid.Column="1"
-										VerticalAlignment="Center"
-										Text="Breadcrumb goes here" />
-									<FontIcon
-										Grid.Column="2"
-										FontSize="14"
-										Glyph="&#xe70d;" />
-								</Grid>
-							</controls:OmnibarMode.ContentOnInactive>
-						</controls:OmnibarMode>
+					<Grid ColumnSpacing="8">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="*" />
+							<ColumnDefinition Width="*" />
+						</Grid.ColumnDefinitions>
 
-						<controls:OmnibarMode ModeName="Palette" TextPlaceholder="Enter a palette command...">
-							<controls:OmnibarMode.IconOnActive>
-								<FontIcon FontSize="14" Glyph="&#xE713;" />
-							</controls:OmnibarMode.IconOnActive>
-							<controls:OmnibarMode.IconOnInactive>
-								<FontIcon FontSize="14" Glyph="&#xE713;" />
-							</controls:OmnibarMode.IconOnInactive>
-						</controls:OmnibarMode>
+						<TextBox
+							Grid.Column="0"
+							Header="Suggestion index:"
+							IsReadOnly="True"
+							Text="{x:Bind Omnibar1_ChosenSuggestionIndex, Mode=OneWay}" />
 
-						<controls:OmnibarMode ModeName="Search" TextPlaceholder="Enter a search query...">
-							<controls:OmnibarMode.IconOnActive>
-								<FontIcon FontSize="14" Glyph="&#xE713;" />
-							</controls:OmnibarMode.IconOnActive>
-							<controls:OmnibarMode.IconOnInactive>
-								<FontIcon FontSize="14" Glyph="&#xE713;" />
-							</controls:OmnibarMode.IconOnInactive>
-						</controls:OmnibarMode>
+						<TextBox
+							Grid.Column="1"
+							Header="Submitted query:"
+							IsReadOnly="True"
+							Text="{x:Bind Omnibar1_SubmittedQuery, Mode=OneWay}" />
 
-					</controls:Omnibar>
+					</Grid>
 
 				</StackPanel>
-			</controls:SamplePanel.MainContent>
-			<controls:SamplePanel.SideContent>
-				<StackPanel Spacing="12">
-					<ToggleSwitch
-						x:Name="Omnibar2IsEnableToggleSwitch"
-						Header="Enable/disable Omnibar:"
-						IsOn="True" />
-					<TextBox
-						Header="Current selected mode:"
-						IsReadOnly="True"
-						Text="{x:Bind Omnibar2.CurrentSelectedMode, Mode=OneWay}" />
-				</StackPanel>
 			</controls:SamplePanel.SideContent>
 		</controls:SamplePanel>
 
diff --git a/tests/Files.App.UITests/Views/OmnibarPage.xaml.cs b/tests/Files.App.UITests/Views/OmnibarPage.xaml.cs
index a1d577b09b69..0fd9bc89e01e 100644
--- a/tests/Files.App.UITests/Views/OmnibarPage.xaml.cs
+++ b/tests/Files.App.UITests/Views/OmnibarPage.xaml.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
+using CommunityToolkit.WinUI;
+using Files.App.Controls;
 using Files.App.UITests.Data;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -10,13 +12,28 @@ namespace Files.App.UITests.Views
 {
 	public sealed partial class OmnibarPage : Page
 	{
-		private readonly ObservableCollection<DummyItem1> DummyItems1;
+		private readonly string Omnibar1_TextMemberPathForPaletteMode = nameof(OmnibarPaletteSuggestionItem.Title);
+
+		private readonly ObservableCollection<OmnibarPaletteSuggestionItem> Omnibar1_PaletteSuggestions;
+		private readonly ObservableCollection<BreadcrumbBarItemModel> Omnibar1_BreadcrumbBarItems;
+
+		[GeneratedDependencyProperty(DefaultValue = "")]
+		private partial string Omnibar1_Text { get; set; }
+
+		[GeneratedDependencyProperty(DefaultValue = "")]
+		private partial string Omnibar1_TextChangedReason { get; set; }
+
+		[GeneratedDependencyProperty]
+		private partial int Omnibar1_ChosenSuggestionIndex { get; set; }
+
+		[GeneratedDependencyProperty(DefaultValue = "")]
+		private partial string Omnibar1_SubmittedQuery { get; set; }
 
 		public OmnibarPage()
 		{
 			InitializeComponent();
 
-			DummyItems1 =
+			Omnibar1_PaletteSuggestions =
 			[
 				new("Open online help page in browser", "Open online help page in browser", "Control + H"),
 				new("Toggle full screen", "Toggle full screen", "Control + H"),
@@ -28,6 +45,50 @@ public OmnibarPage()
 				new("Undo the last file operation", "Undo the last file operation", "Control + H"),
 				new("Toggle whether to show hidden items", "Toggle whether to show hidden items", "Control + H"),
 			];
+
+			Omnibar1_BreadcrumbBarItems =
+			[
+				new("Local Disk (C:)"),
+				new("Users"),
+				new("me"),
+				new("OneDrive"),
+				new("Desktop"),
+				new("Folder1"),
+				new("Folder2"),
+			];
+		}
+
+		private void Omnibar1_BreadcrumbBar_ItemDropDownFlyoutOpening(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
+		{
+			e.Flyout.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Item 1" });
+			e.Flyout.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Item 2" });
+			e.Flyout.Items.Add(new MenuFlyoutItem { Icon = new FontIcon() { Glyph = "\uE8B7" }, Text = "Item 3" });
+		}
+
+		private void Omnibar1_BreadcrumbBar_ItemDropDownFlyoutClosed(object sender, BreadcrumbBarItemDropDownFlyoutEventArgs e)
+		{
+			e.Flyout.Items.Clear();
+		}
+
+		private void Omnibar1_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedEventArgs args)
+		{
+			Omnibar1_ChosenSuggestionIndex = args.Item is OmnibarPaletteSuggestionItem item ? Omnibar1_PaletteSuggestions.IndexOf(item) : -1;
+			Omnibar1_SubmittedQuery = args.Mode.Text ?? string.Empty;
+		}
+
+		private void Omnibar1_TextChanged(Omnibar sender, OmnibarTextChangedEventArgs args)
+		{
+			if (args.Reason is not OmnibarTextChangeReason.SuggestionChosen)
+				Omnibar1_ChosenSuggestionIndex = -1;
+
+			Omnibar1_Text = args.Mode.Text ?? string.Empty;
+			Omnibar1_TextChangedReason = args.Reason.ToString();
+		}
+
+		private void Omnibar1_SuggestionChosen(Omnibar sender, OmnibarSuggestionChosenEventArgs args)
+		{
+			Omnibar1_ChosenSuggestionIndex = args.SelectedItem is OmnibarPaletteSuggestionItem item ? Omnibar1_PaletteSuggestions.IndexOf(item) : -1;
+			Omnibar1_SubmittedQuery = args.Mode.Text ?? string.Empty;
 		}
 	}
 }