Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r149c1b4d30710a88480556b70ba2b49015b1dded -r66ee69642e1342ee03613d7d73831346f00d269c
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 149c1b4d30710a88480556b70ba2b49015b1dded)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 66ee69642e1342ee03613d7d73831346f00d269c)
@@ -37,6 +37,7 @@
 using log4net;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.Views;
@@ -139,11 +140,13 @@
         /// </summary>
         public override IEnumerable<ViewInfo> GetViewInfos()
         {
-            yield return new ViewInfo<FailureMechanismContributionContext, FailureMechanismContributionView>
+            yield return new ViewInfo<FailureMechanismContributionContext, FailureMechanismContribution, FailureMechanismContributionView>
             {
                 GetViewName = (v, o) => RingtoetsDataResources.FailureMechanismContribution_DisplayName,
+                GetViewData = context => context.WrappedData,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                CloseForData = CloseFailureMechanismContributionViewForData
+                CloseForData = CloseFailureMechanismContributionViewForData,
+                AfterCreate = (view, context) => view.AssessmentSection = context.Parent
             };
 
             yield return new ViewInfo<IAssessmentSection, AssessmentSectionView>
@@ -253,7 +256,7 @@
             {
                 Text = failureMechanismContribution => RingtoetsDataResources.FailureMechanismContribution_DisplayName,
                 Image = failureMechanismContribution => RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                ContextMenuStrip = (failureMechanismContribution, parentData, treeViewControl) => Gui.Get(failureMechanismContribution.WrappedData, treeViewControl)
+                ContextMenuStrip = (failureMechanismContribution, parentData, treeViewControl) => Gui.Get(failureMechanismContribution, treeViewControl)
                                                                                                      .AddOpenItem()
                                                                                                      .AddSeparator()
                                                                                                      .AddExportItem()
@@ -295,8 +298,7 @@
         private static bool CloseFailureMechanismContributionViewForData(FailureMechanismContributionView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
-            var viewData = view.Data as FailureMechanismContributionContext;
-            return assessmentSection != null && viewData != null && assessmentSection.FailureMechanismContribution == viewData.WrappedData;
+            return assessmentSection != null && assessmentSection.FailureMechanismContribution == view.Data && assessmentSection == view.AssessmentSection;
         }
 
         #endregion