Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs
===================================================================
diff -u -ra3e4620f5e663d447936fbc69068b02168764733 -r4bae6533eca598f7c8c19eab3e2482ee65eb0120
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs	(.../MacroStabilityInwardsScenariosView.cs)	(revision a3e4620f5e663d447936fbc69068b02168764733)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsScenariosView.cs	(.../MacroStabilityInwardsScenariosView.cs)	(revision 4bae6533eca598f7c8c19eab3e2482ee65eb0120)
@@ -31,7 +31,6 @@
 using Core.Common.Base.Helpers;
 using Core.Common.Controls.Views;
 using Core.Common.Util.Extensions;
-using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Probability;
@@ -47,7 +46,6 @@
     public partial class MacroStabilityInwardsScenariosView : UserControl, IView
     {
         private readonly MacroStabilityInwardsFailureMechanism failureMechanism;
-        private readonly IAssessmentSection assessmentSection;
         private CalculationGroup calculationGroup;
 
         private Observer failureMechanismObserver;
@@ -182,9 +180,9 @@
 
                 listBox.Items.AddRange(failureMechanismSectionViewModels.Cast<object>().ToArray());
                 listBox.SelectedItem = selectedFailureMechanismSection != null
-                                           ? failureMechanismSectionViewModels.FirstOrDefault(vm => vm.Section == selectedFailureMechanismSection.Section)
-                                             ?? failureMechanismSectionViewModels.First()
-                                           : failureMechanismSectionViewModels.First();
+                                           ? Array.Find(failureMechanismSectionViewModels, vm => vm.Section == selectedFailureMechanismSection.Section)
+                                             ?? failureMechanismSectionViewModels[0]
+                                           : failureMechanismSectionViewModels[0];
             }
             else
             {
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs
===================================================================
diff -u -r2184897a7ad2605265152cc68f227a4ee8d0940e -r4bae6533eca598f7c8c19eab3e2482ee65eb0120
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs	(.../PipingScenariosView.cs)	(revision 2184897a7ad2605265152cc68f227a4ee8d0940e)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Views/PipingScenariosView.cs	(.../PipingScenariosView.cs)	(revision 4bae6533eca598f7c8c19eab3e2482ee65eb0120)
@@ -299,9 +299,9 @@
 
                 listBox.Items.AddRange(failureMechanismSectionViewModels.Cast<object>().ToArray());
                 listBox.SelectedItem = selectedFailureMechanismSection != null
-                                           ? failureMechanismSectionViewModels.FirstOrDefault(vm => vm.Section == selectedFailureMechanismSection.Section)
-                                             ?? failureMechanismSectionViewModels.First()
-                                           : failureMechanismSectionViewModels.First();
+                                           ? Array.Find(failureMechanismSectionViewModels, vm => vm.Section == selectedFailureMechanismSection.Section)
+                                             ?? failureMechanismSectionViewModels[0]
+                                           : failureMechanismSectionViewModels[0];
             }
             else
             {