Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r255ffcdbfd4ffff68c336ad9922e6196636c2803 -r261bbc6b1f16b951a12123626a914fe764ac31d0
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 255ffcdbfd4ffff68c336ad9922e6196636c2803)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 261bbc6b1f16b951a12123626a914fe764ac31d0)
@@ -391,6 +391,13 @@
                 return ReferenceEquals(commentView.Data, calculationContext.WrappedData);
             }
 
+            var failureMechanismContext = o as IFailureMechanismContext<IFailureMechanism>;
+            if (failureMechanismContext != null)
+            {
+                return GetCommentableElements(failureMechanismContext.WrappedData)
+                    .Any(commentableElement => ReferenceEquals(commentView.Data, commentableElement));
+            }
+
             var assessmentSection = o as IAssessmentSection;
             if (assessmentSection != null)
             {