From 2b79e1260c5853ef60681a0f9c8f384732b0fb49 Mon Sep 17 00:00:00 2001
From: 0x5BFA <62196528+0x5bfa@users.noreply.github.com>
Date: Mon, 5 May 2025 01:15:18 +0900
Subject: [PATCH] Fix

---
 src/Files.App/UserControls/NavigationToolbar.xaml  |  5 ++++-
 .../UserControls/NavigationToolbarViewModel.cs     | 14 +++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Files.App/UserControls/NavigationToolbar.xaml b/src/Files.App/UserControls/NavigationToolbar.xaml
index 503e4d3f27be..fbcb5dd9a043 100644
--- a/src/Files.App/UserControls/NavigationToolbar.xaml
+++ b/src/Files.App/UserControls/NavigationToolbar.xaml
@@ -335,13 +335,14 @@
 			x:Name="Omnibar"
 			Grid.Column="1"
 			x:Load="{x:Bind ViewModel.EnableOmnibar, Mode=OneWay}"
-			CurrentSelectedModeName="{x:Bind ViewModel.OmnibarCurrentSelectedModeName, Mode=TwoWay}"
+			CurrentSelectedMode="{x:Bind ViewModel.OmnibarCurrentSelectedMode, Mode=TwoWay}"
 			IsFocused="{x:Bind ViewModel.IsOmnibarFocused, Mode=TwoWay}"
 			QuerySubmitted="Omnibar_QuerySubmitted"
 			SuggestionChosen="Omnibar_SuggestionChosen"
 			TextChanged="Omnibar_TextChanged">
 
 			<controls:OmnibarMode
+				x:Name="OmnibarPathMode"
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Path}, IconType=Outline}"
 				IsDefault="True"
@@ -378,6 +379,7 @@
 			</controls:OmnibarMode>
 
 			<controls:OmnibarMode
+				x:Name="OmnibarCommandPaletteMode"
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Commands}, IconType=Outline}"
 				ModeName="{helpers:ResourceString Name=CommandPalette}"
@@ -420,6 +422,7 @@
 			</controls:OmnibarMode>
 
 			<controls:OmnibarMode
+				x:Name="OmnibarSearchMode"
 				IconOnActive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IsFilled=True}"
 				IconOnInactive="{controls:ThemedIconMarkup Style={StaticResource App.ThemedIcons.Omnibar.Search}, IconType=Outline}"
 				ModeName="{helpers:ResourceString Name=Search}"
diff --git a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
index 0cafe7e4e42c..6ebe943cc44f 100644
--- a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
@@ -23,9 +23,9 @@ public sealed partial class NavigationToolbarViewModel : ObservableObject, IAddr
 
 		private const int MaxSuggestionsCount = 10;
 
-		public const string OmnibarPathModeName = "Path";
-		public const string OmnibarPaletteModeName = "Palette";
-		public const string OmnibarSearchModeName = "Search";
+		public const string OmnibarPathModeName = "OmnibarPathMode";
+		public const string OmnibarPaletteModeName = "OmnibarCommandPaletteMode";
+		public const string OmnibarSearchModeName = "OmnibarSearchMode";
 
 		// Dependency injections
 
@@ -229,7 +229,7 @@ public  bool IsOmnibarFocused
 				{
 					if (value)
 					{
-						switch(OmnibarCurrentSelectedModeName)
+						switch(OmnibarCurrentSelectedMode.Name)
 						{
 							case OmnibarPathModeName:
 								PathText =
@@ -243,7 +243,7 @@ public  bool IsOmnibarFocused
 							case OmnibarSearchModeName:
 								break;
 							default:
-								throw new ArgumentOutOfRangeException("");
+								break;
 						}
 
 					}
@@ -251,8 +251,8 @@ public  bool IsOmnibarFocused
 			}
 		}
 
-		private string _OmnibarCurrentSelectedModeName;
-		public string OmnibarCurrentSelectedModeName { get => _OmnibarCurrentSelectedModeName; set => SetProperty(ref _OmnibarCurrentSelectedModeName, value); }
+		private OmnibarMode _OmnibarCurrentSelectedMode;
+		public OmnibarMode OmnibarCurrentSelectedMode { get => _OmnibarCurrentSelectedMode; set => SetProperty(ref _OmnibarCurrentSelectedMode, value); }
 
 		private CurrentInstanceViewModel _InstanceViewModel;
 		public CurrentInstanceViewModel InstanceViewModel