Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r7b50f68c9261f081536c340c6926925ff7281c1a -r255ffcdbfd4ffff68c336ad9922e6196636c2803
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 7b50f68c9261f081536c340c6926925ff7281c1a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 255ffcdbfd4ffff68c336ad9922e6196636c2803)
@@ -378,17 +378,17 @@
 
         private static bool CloseCommentViewForData(CommentView commentView, object o)
         {
-            var calculationContext = o as PipingCalculationScenarioContext;
-            if (calculationContext != null)
+            var calculationGroupContext = o as ICalculationContext<CalculationGroup, IFailureMechanism>;
+            if (calculationGroupContext != null)
             {
-                return calculationContext.WrappedData == commentView.Data;
+                return GetCommentableElements(calculationGroupContext.WrappedData)
+                    .Any(commentableElement => ReferenceEquals(commentView.Data, commentableElement));
             }
 
-            var calculationGroupContext = o as PipingCalculationGroupContext;
-            if (calculationGroupContext != null)
+            var calculationContext = o as ICalculationContext<ICalculationBase, IFailureMechanism>;
+            if (calculationContext != null)
             {
-                return GetCommentableElements(calculationGroupContext)
-                    .Any(commentableElement => ReferenceEquals(commentView.Data, commentableElement));
+                return ReferenceEquals(commentView.Data, calculationContext.WrappedData);
             }
 
             var assessmentSection = o as IAssessmentSection;
@@ -401,9 +401,9 @@
             return false;
         }
 
-        private static IEnumerable<ICommentable> GetCommentableElements(PipingCalculationGroupContext calculationGroupContext)
+        private static IEnumerable<ICommentable> GetCommentableElements(CalculationGroup calculationGroup)
         {
-            return calculationGroupContext.WrappedData.GetCalculations();
+            return calculationGroup.GetCalculations();
         }
 
         private static IEnumerable<ICommentable> GetCommentableElements(IAssessmentSection assessmentSection)