diff --git a/src/Files.App/BaseLayout.cs b/src/Files.App/BaseLayout.cs
index 642aa9d42005..fdcd246a6b77 100644
--- a/src/Files.App/BaseLayout.cs
+++ b/src/Files.App/BaseLayout.cs
@@ -782,7 +782,7 @@ protected async void Item_DragOver(object sender, DragEventArgs e)
 							dragOverTimer.Stop();
 							ItemManipulationModel.SetSelectedItem(dragOverItem);
 							dragOverItem = null;
-							NavigationHelpers.OpenSelectedItems(ParentShellPageInstance!, false);
+							_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance!, false);
 						}
 					}, TimeSpan.FromMilliseconds(1000), false);
 				}
diff --git a/src/Files.App/Helpers/NavigationHelpers.cs b/src/Files.App/Helpers/NavigationHelpers.cs
index aa2c11e161de..e9396f9dd995 100644
--- a/src/Files.App/Helpers/NavigationHelpers.cs
+++ b/src/Files.App/Helpers/NavigationHelpers.cs
@@ -42,7 +42,7 @@ public static async void LaunchNewWindow()
 			await Launcher.LaunchUriAsync(filesUWPUri);
 		}
 
-		public static async void OpenSelectedItems(IShellPage associatedInstance, bool openViaApplicationPicker = false)
+		public static async Task OpenSelectedItems(IShellPage associatedInstance, bool openViaApplicationPicker = false)
 		{
 			// Don't open files and folders inside recycle bin
 			if (associatedInstance.FilesystemViewModel.WorkingDirectory.StartsWith(CommonPaths.RecycleBinPath, StringComparison.Ordinal))
@@ -60,7 +60,6 @@ public static async void OpenSelectedItems(IShellPage associatedInstance, bool o
 				selectedItems.Count > 1 &&
 				selectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.File && !x.IsExecutable && !x.IsShortcut))
 			{
-
 				opened = await Win32Helpers.InvokeWin32ComponentAsync(string.Join('|', selectedItems.Select(x => x.ItemPath)), associatedInstance);
 			}
 
diff --git a/src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs b/src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs
index 43ce932ae281..26386553b10a 100644
--- a/src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs
+++ b/src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs
@@ -129,7 +129,7 @@ public virtual void SidebarUnpinItem(RoutedEventArgs e)
 
 		public virtual void OpenItem(RoutedEventArgs e)
 		{
-			NavigationHelpers.OpenSelectedItems(associatedInstance, false);
+			_ = NavigationHelpers.OpenSelectedItems(associatedInstance, false);
 		}
 
 		public virtual void UnpinDirectoryFromFavorites(RoutedEventArgs e)
@@ -238,7 +238,7 @@ public virtual void OpenParentFolder(RoutedEventArgs e)
 
 		public virtual void OpenItemWithApplicationPicker(RoutedEventArgs e)
 		{
-			NavigationHelpers.OpenSelectedItems(associatedInstance, true);
+			_ = NavigationHelpers.OpenSelectedItems(associatedInstance, true);
 		}
 
 		public virtual async void OpenDirectoryInNewTab(RoutedEventArgs e)
diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs
index be9afa253bd1..37120cd3a104 100644
--- a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs
+++ b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs
@@ -361,7 +361,7 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 				if (IsItemSelected && SelectedItem.PrimaryItemAttribute == StorageItemTypes.Folder)
 					ItemInvoked?.Invoke(new ColumnParam { NavPathParam = (SelectedItem is ShortcutItem sht ? sht.TargetPath : SelectedItem.ItemPath), ListView = FileList }, EventArgs.Empty);
 				else
-					NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
+					_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
 
 				e.Handled = true;
 			}
@@ -450,15 +450,11 @@ private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
 				{
 					case StorageItemTypes.File:
 						if (!UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
-						{
-							NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
-						}
+							_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
 						break;
 					case StorageItemTypes.Folder:
 						if (!UserSettingsService.FoldersSettingsService.ColumnLayoutOpenFoldersWithOneClick)
-						{
 							ItemInvoked?.Invoke(new ColumnParam { NavPathParam = (item is ShortcutItem sht ? sht.TargetPath : item.ItemPath), ListView = FileList }, EventArgs.Empty);
-						}
 						break;
 					default:
 						ParentShellPageInstance.Up_Click();
@@ -511,7 +507,7 @@ private void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 				&& (UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick && item.PrimaryItemAttribute == StorageItemTypes.File))
 			{
 				ResetRenameDoubleClick();
-				NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
+				_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
 			}
 			else
 			{
diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs
index d33263cf796b..a409f183a4ba 100644
--- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs
+++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs
@@ -446,7 +446,8 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 				}
 				else
 				{
-					NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
+					await NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
+					FileList.SelectedIndex = 0;
 				}
 				e.Handled = true;
 			}
@@ -554,7 +555,7 @@ private void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 				&& UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
 			{
 				ResetRenameDoubleClick();
-				NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
+				_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
 			}
 			else
 			{
@@ -581,7 +582,7 @@ private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
 			if ((e.OriginalSource as FrameworkElement)?.DataContext is ListedItem item
 				 && !UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
 			{
-				NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
+				_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
 			}
 			else
 			{
diff --git a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
index fbb576e06e3a..437f01253e68 100644
--- a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
+++ b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
@@ -392,7 +392,7 @@ private async void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
 				}
 				else
 				{
-					NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
+					_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
 				}
 				e.Handled = true;
 			}
@@ -517,7 +517,7 @@ private void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
 				&& UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
 			{
 				ResetRenameDoubleClick();
-				NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
+				_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
 			}
 			else
 			{
@@ -552,7 +552,7 @@ private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
 			if ((e.OriginalSource as FrameworkElement)?.DataContext is ListedItem item
 				 && !UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
 			{
-				NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
+				_ = NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
 			}
 			else
 			{