Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -r3ff488a27f75d080db7cf4e13f508ba5555516df -rbae4f8741e1a0155753e3b3734de500712ee4182
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 3ff488a27f75d080db7cf4e13f508ba5555516df)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision bae4f8741e1a0155753e3b3734de500712ee4182)
@@ -241,7 +241,11 @@
         private bool ClosePipingFailureMechanismViewForData(PipingFailureMechanismView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
-            return assessmentSection != null && ReferenceEquals(((PipingFailureMechanismContext) view.Data).Parent, assessmentSection);
+            var isAssessmentSectionRemoved = assessmentSection != null && ReferenceEquals(((PipingFailureMechanismContext) view.Data).Parent, assessmentSection);
+
+            var isPipingFailureMechanismRemoved = o is PipingFailureMechanism;
+
+            return isAssessmentSectionRemoved || isPipingFailureMechanismRemoved;
         }
 
         # endregion