Index: Core/Common/src/Core.Common.Controls/ViewInfo.cs
===================================================================
diff -u -rfaa921b36b48d7261c77216859d9d5ce532bb119 -r2ea5055c818880a8c2e03f74e2f4e19a427fbb8e
--- Core/Common/src/Core.Common.Controls/ViewInfo.cs	(.../ViewInfo.cs)	(revision faa921b36b48d7261c77216859d9d5ce532bb119)
+++ Core/Common/src/Core.Common.Controls/ViewInfo.cs	(.../ViewInfo.cs)	(revision 2ea5055c818880a8c2e03f74e2f4e19a427fbb8e)
@@ -153,7 +153,7 @@
 
         public Func<TData, object> GetCompositeViewData { get; set; }
 
-        public Func<TView, TData, bool> CloseForData { get; set; }
+        public Func<TView, object, bool> CloseForData { get; set; }
 
         public static implicit operator ViewInfo(ViewInfo<TData, TViewData, TView> viewInfo)
         {
@@ -168,7 +168,7 @@
                 AdditionalDataCheck = o => viewInfo.AdditionalDataCheck == null || viewInfo.AdditionalDataCheck((TData) o),
                 GetViewData = o => viewInfo.GetViewData != null ? viewInfo.GetViewData((TData) o) : o,
                 GetCompositeViewData = o => viewInfo.GetCompositeViewData != null ? viewInfo.GetCompositeViewData((TData) o) : null,
-                CloseForData = (v, o) => viewInfo.CloseForData == null || viewInfo.CloseForData((TView) v, (TData) o),
+                CloseForData = (v, o) => viewInfo.CloseForData != null && viewInfo.CloseForData((TView) v, o),
                 AfterCreate = (v, o) =>
                 {
                     if (viewInfo.AfterCreate != null)
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -r2ea5055c818880a8c2e03f74e2f4e19a427fbb8e
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 2ea5055c818880a8c2e03f74e2f4e19a427fbb8e)
@@ -178,7 +178,7 @@
             var viewsToCheck = views.ToList();
             foreach (var view in viewsToCheck)
             {
-                if (IsViewData(view, data) && (extraCheck == null || extraCheck(view, data)))
+                if (IsViewData(view, data) || extraCheck == null || extraCheck(view, data))
                 {
                     viewAction(view);
                 }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r6fc99be8198e5795ca4be54719dab3d1be3c6299 -r2ea5055c818880a8c2e03f74e2f4e19a427fbb8e
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 6fc99be8198e5795ca4be54719dab3d1be3c6299)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 2ea5055c818880a8c2e03f74e2f4e19a427fbb8e)
@@ -38,7 +38,12 @@
             yield return new ViewInfo<FailureMechanismContribution, FailureMechanismContributionView>
             {
                 GetViewName = (v,o) => Resources.FailureMechanismContribution_DisplayName,
-                Image = Forms.Properties.Resources.GenericInputOutputIcon
+                Image = Forms.Properties.Resources.GenericInputOutputIcon,
+                CloseForData = (v, o) =>
+                {
+                    var assessmentSection = o as AssessmentSectionBase;
+                    return assessmentSection != null && assessmentSection.FailureMechanismContribution == v.Data;
+                }
             };
         }