Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/CommentContext.cs
===================================================================
diff -u -r5ef5e3e186036b4985798236624d86b2801b87d3 -r1e6d07e8cbd1c29a16b5addddb7205e717543729
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/CommentContext.cs	(.../CommentContext.cs)	(revision 5ef5e3e186036b4985798236624d86b2801b87d3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/CommentContext.cs	(.../CommentContext.cs)	(revision 1e6d07e8cbd1c29a16b5addddb7205e717543729)
@@ -21,6 +21,7 @@
 
 using System;
 using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.AssessmentSection;
 
 namespace Ringtoets.Common.Forms.PresentationObjects
 {
@@ -33,19 +34,30 @@
         /// Creates a new instance of <see cref="CommentContext{T}"/>.
         /// </summary>
         /// <param name="commentContainer">The container to wrap.</param>
+        /// <param name="assessmentSection">The assessment section the <paramref name="commentContainer"/> belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="commentContainer"/> is <c>null</c>.</exception>
-        public CommentContext(T commentContainer)
+        public CommentContext(T commentContainer, IAssessmentSection assessmentSection)
         {
             if (commentContainer == null)
             {
                 throw new ArgumentNullException("commentContainer");
             }
+            if (assessmentSection == null)
+            {
+                throw new ArgumentNullException("assessmentSection");
+            }
             CommentContainer = commentContainer;
+            AssessmentSection = assessmentSection;
         }
 
         /// <summary>
         /// Gets the wrapped comment container.
         /// </summary>
         public T CommentContainer { get; private set; }
+
+        /// <summary>
+        /// Gets the assessment section which the <see cref="CommentContainer"/> belongs to.
+        /// </summary>
+        public IAssessmentSection AssessmentSection { get; private set; }
     }
 }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CommentView.cs
===================================================================
diff -u -r638c0c354f63b4c8be69feb448712b004d8bb933 -r1e6d07e8cbd1c29a16b5addddb7205e717543729
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CommentView.cs	(.../CommentView.cs)	(revision 638c0c354f63b4c8be69feb448712b004d8bb933)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/CommentView.cs	(.../CommentView.cs)	(revision 1e6d07e8cbd1c29a16b5addddb7205e717543729)
@@ -24,6 +24,7 @@
 using Core.Common.Controls.TextEditor;
 using Core.Common.Controls.Views;
 using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.AssessmentSection;
 
 namespace Ringtoets.Common.Forms.Views
 {
@@ -45,6 +46,11 @@
             InitializeRichTextEditor();
         }
 
+        /// <summary>
+        /// Gets and sets the assessment section the <see cref="CommentView"/> belongs to.
+        /// </summary>
+        public IAssessmentSection AssessmentSection { get; set; }
+
         public object Data
         {
             get
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CommentContextTest.cs
===================================================================
diff -u -r5ef5e3e186036b4985798236624d86b2801b87d3 -r1e6d07e8cbd1c29a16b5addddb7205e717543729
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CommentContextTest.cs	(.../CommentContextTest.cs)	(revision 5ef5e3e186036b4985798236624d86b2801b87d3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/CommentContextTest.cs	(.../CommentContextTest.cs)	(revision 1e6d07e8cbd1c29a16b5addddb7205e717543729)
@@ -1,6 +1,7 @@
 using System;
 using NUnit.Framework;
 using Rhino.Mocks;
+using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Forms.PresentationObjects;
 
@@ -14,26 +15,49 @@
         {
             // Setup
             var mocks = new MockRepository();
+            var commentMock = mocks.StrictMock<IComment>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             mocks.ReplayAll();
 
             // Call
-            var context = new CommentContext<IAssessmentSection>(assessmentSectionMock);
+            var context = new CommentContext<IComment>(commentMock, assessmentSectionMock);
 
             // Assert
-            Assert.AreSame(assessmentSectionMock, context.CommentContainer);
+            Assert.AreSame(commentMock, context.CommentContainer);
+            Assert.AreSame(assessmentSectionMock, context.AssessmentSection);
         }
 
         [Test]
-        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
+        public void Constructor_CommentContainerNull_ThrowsArgumentNullException()
         {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+
+            mocks.ReplayAll();
             // Call
-            TestDelegate call = () => new CommentContext<IAssessmentSection>(null);
+            TestDelegate call = () => new CommentContext<IComment>(null, assessmentSectionMock);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("commentContainer", exception.ParamName);
         }
+
+        [Test]
+        public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var commentMock = mocks.StrictMock<IComment>();
+
+            mocks.ReplayAll();
+            // Call
+            TestDelegate call = () => new CommentContext<IComment>(commentMock, null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("assessmentSection", exception.ParamName);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -rc4d2af65ad23757fb3bd11f93458839bc1787ded -r1e6d07e8cbd1c29a16b5addddb7205e717543729
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 1e6d07e8cbd1c29a16b5addddb7205e717543729)
@@ -166,7 +166,8 @@
                 GetViewName = (v, o) => RingtoetsCommonDataResources.AssessmentSectionComment_DisplayName,
                 GetViewData = context => context.CommentContainer,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                CloseForData = CloseCommentViewForData
+                CloseForData = CloseCommentViewForData,
+                AfterCreate = (view, context) => view.AssessmentSection = context.AssessmentSection
             };
         }
 
@@ -314,8 +315,8 @@
 
         private static bool CloseCommentViewForData(CommentView view, object o)
         {
-            var comment = o as IComment;
-            return comment != null && comment == view.Data;
+            var assessmentSection = o as IAssessmentSection;
+            return assessmentSection != null && assessmentSection == view.AssessmentSection;
         }
 
         #endregion
@@ -340,7 +341,7 @@
                 new ReferenceLineContext(nodeData),
                 new FailureMechanismContributionContext(nodeData.FailureMechanismContribution, nodeData),
                 new HydraulicBoundaryDatabaseContext(nodeData),
-                new CommentContext<IComment>(nodeData)
+                new CommentContext<IComment>(nodeData, nodeData)
             };
 
             var failureMechanismContexts = WrapFailureMechanismsInContexts(nodeData);
@@ -426,7 +427,7 @@
                 new FailureMechanismSectionsContext(nodeData, assessmentSection),
                 nodeData.Locations,
                 nodeData.BoundaryConditions,
-                new CommentContext<IComment>(nodeData)
+                new CommentContext<IComment>(nodeData, assessmentSection)
             };
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs
===================================================================
diff -u -r638c0c354f63b4c8be69feb448712b004d8bb933 -r1e6d07e8cbd1c29a16b5addddb7205e717543729
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision 638c0c354f63b4c8be69feb448712b004d8bb933)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CommentContextTreeNodeInfoTest.cs	(.../CommentContextTreeNodeInfoTest.cs)	(revision 1e6d07e8cbd1c29a16b5addddb7205e717543729)
@@ -76,6 +76,7 @@
         public void Text_Always_ReturnsName()
         {
             // Setup
+            var commentMock = mocks.StrictMock<IComment>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             mocks.ReplayAll();
@@ -84,7 +85,7 @@
             {
                 var info = GetInfo(plugin);
 
-                var context = new CommentContext<IComment>(assessmentSectionMock);
+                var context = new CommentContext<IComment>(commentMock, assessmentSectionMock);
 
                 // Call
                 var text = info.Text(context);
@@ -100,13 +101,14 @@
         public void Image_Always_ReturnsSetImage()
         {
             // Setup
+            var commentMock = mocks.StrictMock<IComment>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             mocks.ReplayAll();
 
             using (var plugin = new RingtoetsGuiPlugin())
             {
                 var info = GetInfo(plugin);
-                var context = new CommentContext<IComment>(assessmentSectionMock);
+                var context = new CommentContext<IComment>(commentMock, assessmentSectionMock);
 
                 // Call
                 var image = info.Image(context);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs
===================================================================
diff -u -r638c0c354f63b4c8be69feb448712b004d8bb933 -r1e6d07e8cbd1c29a16b5addddb7205e717543729
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 638c0c354f63b4c8be69feb448712b004d8bb933)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/CommentViewInfoTest.cs	(.../CommentViewInfoTest.cs)	(revision 1e6d07e8cbd1c29a16b5addddb7205e717543729)
@@ -43,19 +43,35 @@
         public void GetViewName_Always_ReturnsViewName()
         {
             // Setup
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var commentMock = mocks.StrictMock<IComment>();
             var viewMock = mocks.StrictMock<CommentView>();
 
             mocks.ReplayAll();
 
             // Call
-            var viewName = info.GetViewName(viewMock, assessmentSectionMock);
+            var viewName = info.GetViewName(viewMock, commentMock);
 
             // Assert
             Assert.AreEqual("Opmerkingen", viewName);
         }
 
         [Test]
+        public void GetViewData_Always_ReturnsIComment()
+        {
+            // Setup
+            var commentMock = mocks.StrictMock<IComment>();
+            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var contextMock = mocks.StrictMock<CommentContext<IComment>>(commentMock, assessmentSectionMock);
+            mocks.ReplayAll();
+
+            // Call
+            var viewData = info.GetViewData(contextMock);
+
+            // Assert
+            Assert.AreSame(commentMock, viewData);
+        }
+
+        [Test]
         public void ViewType_Always_ReturnsViewType()
         {
             // Call
@@ -100,9 +116,11 @@
         {
             // Setup
             var viewMock = mocks.StrictMock<CommentView>();
+            var commentMock = mocks.Stub<IComment>();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
 
-            viewMock.Expect(vm => vm.Data).Return(assessmentSectionMock);
+            viewMock.Expect(vm => vm.Data).Return(commentMock);
+            viewMock.Expect(vm => vm.AssessmentSection).Return(assessmentSectionMock);
 
             mocks.ReplayAll();
 
@@ -118,10 +136,12 @@
         {
             // Setup
             var viewMock = mocks.StrictMock<CommentView>();
+            var commentMock = mocks.Stub<IComment>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var assessmentSectionMock2 = mocks.StrictMock<IAssessmentSection>();
 
-            viewMock.Expect(vm => vm.Data).Return(assessmentSectionMock2);
+            viewMock.Expect(vm => vm.Data).Return(commentMock);
+            viewMock.Expect(vm => vm.AssessmentSection).Return(assessmentSectionMock2);
 
             mocks.ReplayAll();
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -rc4d2af65ad23757fb3bd11f93458839bc1787ded -r1e6d07e8cbd1c29a16b5addddb7205e717543729
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision c4d2af65ad23757fb3bd11f93458839bc1787ded)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 1e6d07e8cbd1c29a16b5addddb7205e717543729)
@@ -437,7 +437,7 @@
                 new FailureMechanismSectionsContext(failureMechanism, assessmentSection),
                 new RingtoetsPipingSurfaceLinesContext(failureMechanism, assessmentSection),
                 new StochasticSoilModelContext(failureMechanism, assessmentSection),
-                new CommentContext<IComment>(failureMechanism)
+                new CommentContext<IComment>(failureMechanism, assessmentSection)
             };
         }
 
@@ -498,7 +498,7 @@
         {
             var childNodes = new List<object>
             {
-                new CommentContext<IComment>(pipingCalculationContext.WrappedData),
+                new CommentContext<IComment>(pipingCalculationContext.WrappedData, pipingCalculationContext.AssessmentSection),
                 new PipingInputContext(pipingCalculationContext.WrappedData.InputParameters,
                                        pipingCalculationContext.AvailablePipingSurfaceLines,
                                        pipingCalculationContext.AvailableStochasticSoilModels,