Requested changes

Author: ferrariofilippo

src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs

@@ -884,18 +884,18 @@ private void ItemSelected_Checked(object sender, RoutedEventArgs e)
 
 		private void ItemSelected_Unchecked(object sender, RoutedEventArgs e)
 		{
-			if (sender is CheckBox checkBox)
-			{
-				if (checkBox.DataContext is ListedItem item && FileList.SelectedItems.Contains(item))
-					FileList.SelectedItems.Remove(item);
-
-				// Workaround for #17298
-				checkBox.IsTabStop = false;
-				checkBox.IsEnabled = false;
-				checkBox.IsEnabled = true;
-				checkBox.IsTabStop = true;
-				FileList.Focus(FocusState.Programmatic);
-			}
+			if (sender is not CheckBox checkBox)
+				return;
+
+			if (checkBox.DataContext is ListedItem item && FileList.SelectedItems.Contains(item))
+				FileList.SelectedItems.Remove(item);
+
+			// Workaround for #17298
+			checkBox.IsTabStop = false;
+			checkBox.IsEnabled = false;
+			checkBox.IsEnabled = true;
+			checkBox.IsTabStop = true;
+			FileList.Focus(FocusState.Programmatic);
 		}
 
 		private new void FileList_ContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)

src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs

@@ -670,18 +670,18 @@ checkBox.DataContext is ListedItem item &&
 
 		private void ItemSelected_Unchecked(object sender, RoutedEventArgs e)
 		{
-			if (sender is CheckBox checkBox)
-			{
-				if (checkBox.DataContext is ListedItem item && FileList.SelectedItems.Contains(item))
-					FileList.SelectedItems.Remove(item);
+			if (sender is not CheckBox checkBox)
+				return;
 
-				// Workaround for #17298
-				checkBox.IsTabStop = false;
-				checkBox.IsEnabled = false;
-				checkBox.IsEnabled = true;
-				checkBox.IsTabStop = true;
-				FileList.Focus(FocusState.Programmatic);
-			}
+			if (checkBox.DataContext is ListedItem item && FileList.SelectedItems.Contains(item))
+				FileList.SelectedItems.Remove(item);
+
+			// Workaround for #17298
+			checkBox.IsTabStop = false;
+			checkBox.IsEnabled = false;
+			checkBox.IsEnabled = true;
+			checkBox.IsTabStop = true;
+			FileList.Focus(FocusState.Programmatic);
 		}
 
 		private new void FileList_ContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)