diff --git a/src/Files.App.Controls/Omnibar/Omnibar.Events.cs b/src/Files.App.Controls/Omnibar/Omnibar.Events.cs
index 4499c41ab5d4..bdb8de3e3fac 100644
--- a/src/Files.App.Controls/Omnibar/Omnibar.Events.cs
+++ b/src/Files.App.Controls/Omnibar/Omnibar.Events.cs
@@ -129,6 +129,12 @@ private void AutoSuggestBoxSuggestionsPopup_GettingFocus(UIElement sender, Getti
 			args.TryCancel();
 		}
 
+		private void AutoSuggestBoxSuggestionsPopup_Opened(object? sender, object e)
+		{
+			if (_textBoxSuggestionsListView.Items.Count > 0)
+				_textBoxSuggestionsListView.ScrollIntoView(_textBoxSuggestionsListView.Items[0]);
+		}
+
 		private void AutoSuggestBoxSuggestionsListView_ItemClick(object sender, ItemClickEventArgs e)
 		{
 			if (CurrentSelectedMode is null)
diff --git a/src/Files.App.Controls/Omnibar/Omnibar.cs b/src/Files.App.Controls/Omnibar/Omnibar.cs
index 50c4eecacd43..6ab43cea4e14 100644
--- a/src/Files.App.Controls/Omnibar/Omnibar.cs
+++ b/src/Files.App.Controls/Omnibar/Omnibar.cs
@@ -79,6 +79,7 @@ protected override void OnApplyTemplate()
 			_textBox.KeyDown += AutoSuggestBox_KeyDown;
 			_textBox.TextChanged += AutoSuggestBox_TextChanged;
 			_textBoxSuggestionsPopup.GettingFocus += AutoSuggestBoxSuggestionsPopup_GettingFocus;
+			_textBoxSuggestionsPopup.Opened += AutoSuggestBoxSuggestionsPopup_Opened;
 			_textBoxSuggestionsListView.ItemClick += AutoSuggestBoxSuggestionsListView_ItemClick;
 			_textBoxSuggestionsListView.SelectionChanged += AutoSuggestBoxSuggestionsListView_SelectionChanged;
 
diff --git a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
index 7b2db64ecf6f..8332c2aa3a04 100644
--- a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs
@@ -1232,7 +1232,8 @@ public void PopulateOmnibarSuggestionsForCommandPaletteMode()
 
 			foreach (var item in suggestionItems)
 			{
-				OmnibarCommandPaletteModeSuggestionItems.Add(item);
+				if (item.Text != Commands.OpenCommandPalette.Code.ToString())
+					OmnibarCommandPaletteModeSuggestionItems.Add(item);
 			}
 
 			if (OmnibarCommandPaletteModeSuggestionItems.Count is 0)