Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs
===================================================================
diff -u -raf42240385db3d3f04bca830513c7464e6f74668 -rd207738be4ce6f50f4e3e00839ea433acea10bbd
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision af42240385db3d3f04bca830513c7464e6f74668)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision d207738be4ce6f50f4e3e00839ea433acea10bbd)
@@ -200,26 +200,6 @@
                 EmptyProbabilityAssessmentOutputContextMenuStrip);
         }
 
-        private static bool CloseScenariosViewForData(GrassCoverErosionInwardsScenariosView view, object removedData)
-        {
-            var assessmentSection = removedData as IAssessmentSection;
-            if (assessmentSection != null)
-            {
-                return assessmentSection.GetFailureMechanisms()
-                                        .OfType<GrassCoverErosionInwardsFailureMechanism>()
-                                        .Any(fm => ReferenceEquals(view.Data, fm.CalculationsGroup));
-            }
-
-            var coverErosionInwardsFailureMechanism = removedData as GrassCoverErosionInwardsFailureMechanism;
-            if (coverErosionInwardsFailureMechanism != null)
-            {
-                return ReferenceEquals(view.Data, coverErosionInwardsFailureMechanism.CalculationsGroup);
-            }
-
-            var coverErosionInwardsFailureMechanismContext = removedData as GrassCoverErosionInwardsFailureMechanismContext;
-            return coverErosionInwardsFailureMechanismContext != null && ReferenceEquals(view.Data, coverErosionInwardsFailureMechanismContext.WrappedData.CalculationsGroup);
-        }
-
         private void CalculateAll(GrassCoverErosionInwardsFailureMechanism failureMechanism, IEnumerable<GrassCoverErosionInwardsCalculation> calculations, IAssessmentSection assessmentSection)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations.Select(calc => new GrassCoverErosionInwardsCalculationActivity(calc,
@@ -249,6 +229,31 @@
             return null;
         }
 
+        #region GrassCoverErosionInwardsScenariosView ViewInfo
+
+        private static bool CloseScenariosViewForData(GrassCoverErosionInwardsScenariosView view, object removedData)
+        {
+            var failureMechanism = removedData as GrassCoverErosionInwardsFailureMechanism;
+
+            var failureMechanismContext = removedData as GrassCoverErosionInwardsFailureMechanismContext;
+            if (failureMechanismContext != null)
+            {
+                failureMechanism = failureMechanismContext.WrappedData;
+            }
+
+            var assessmentSection = removedData as IAssessmentSection; 
+            if (assessmentSection != null)
+            {
+                failureMechanism = assessmentSection.GetFailureMechanisms()
+                                                    .OfType<GrassCoverErosionInwardsFailureMechanism>()
+                                                    .FirstOrDefault();
+            }
+
+            return failureMechanism != null && ReferenceEquals(view.Data, failureMechanism.CalculationsGroup);
+        }
+
+        #endregion
+
         #region GrassCoverErosionInwardsFailureMechanismResultView ViewInfo
 
         private static bool CloseFailureMechanismResultViewForData(GrassCoverErosionInwardsFailureMechanismResultView view, object o)