Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r3b5fac4302590ba12f652bc55979d7b0ce59fd87 -r504f726111ede24adc838a345fdcd1c47227c79b
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 3b5fac4302590ba12f652bc55979d7b0ce59fd87)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 504f726111ede24adc838a345fdcd1c47227c79b)
@@ -112,9 +112,10 @@
                 AfterCreate = (view, context) => view.FailureMechanism = context.FailureMechanism
             };
 
-            yield return new ViewInfo<AssessmentSectionComment, AssessmentSectionCommentView>
+            yield return new ViewInfo<AssessmentSectionCommentContext, IAssessmentSection, AssessmentSectionCommentView>
             {
                 GetViewName = (v, o) => RingtoetsCommonDataResources.AssessmentSectionComment_DisplayName,
+                GetViewData = context => context.AssessmentSection,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 CloseForData = CloseAssessmentSectionCommentViewForData
             };
@@ -229,7 +230,7 @@
                                                                                  .Build()
             };
 
-            yield return new TreeNodeInfo<AssessmentSectionComment>
+            yield return new TreeNodeInfo<AssessmentSectionCommentContext>
             {
                 Text = comment => RingtoetsCommonDataResources.AssessmentSectionComment_DisplayName,
                 Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
@@ -265,7 +266,7 @@
         private static bool CloseAssessmentSectionCommentViewForData(AssessmentSectionCommentView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
-            return assessmentSection != null && assessmentSection.Comments == view.Data;
+            return assessmentSection != null && assessmentSection == view.Data;
         }
 
         #endregion
@@ -290,7 +291,7 @@
                 new ReferenceLineContext(nodeData),
                 nodeData.FailureMechanismContribution,
                 new HydraulicBoundaryDatabaseContext(nodeData),
-                nodeData.Comments
+                new AssessmentSectionCommentContext(nodeData)
             };
 
             var failureMechanismContexts = WrapFailureMechanismsInContexts(nodeData);