Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs
===================================================================
diff -u -r9ae12afceb5ab8bf068abdcf70b0e516393e355e -rf132c3732b41ebd5837b63d44fa4c9401f6061c0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision 9ae12afceb5ab8bf068abdcf70b0e516393e355e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision f132c3732b41ebd5837b63d44fa4c9401f6061c0)
@@ -115,7 +115,7 @@
         }
 
         /// <summary>
-        /// Gets or sets the <seealso cref="IApplicationSelection"/>.
+        /// Gets or sets the <see cref="IApplicationSelection"/>.
         /// </summary>
         public IApplicationSelection ApplicationSelection { get; set; }
 
@@ -150,7 +150,6 @@
         {
             AssessmentSection = null;
             PipingFailureMechanism = null;
-            ApplicationSelection = null;
 
             if (disposing && (components != null))
             {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -ra7a3af9bffa76922cf344ee2134ad30078de878d -rf132c3732b41ebd5837b63d44fa4c9401f6061c0
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision a7a3af9bffa76922cf344ee2134ad30078de878d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision f132c3732b41ebd5837b63d44fa4c9401f6061c0)
@@ -249,7 +249,7 @@
         private bool ClosePipingFailureMechanismViewForData(PipingFailureMechanismView view, object o)
         {
             var assessmentSection = o as IAssessmentSection;
-            return assessmentSection != null && ((PipingFailureMechanismContext) view.Data).Parent == assessmentSection;
+            return assessmentSection != null && ReferenceEquals(((PipingFailureMechanismContext) view.Data).Parent, assessmentSection);
         }
 
         # endregion
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -r6695de973dc2574d412c8adc7d9bec18cfac641a -rf132c3732b41ebd5837b63d44fa4c9401f6061c0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision 6695de973dc2574d412c8adc7d9bec18cfac641a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision f132c3732b41ebd5837b63d44fa4c9401f6061c0)
@@ -138,29 +138,25 @@
             var mocks = new MockRepository();
             var pipingFailureMechanism = mocks.StrictMock<PipingFailureMechanism>();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var applicationSelection = mocks.StrictMock<IApplicationSelection>();
 
             mocks.ReplayAll();
 
             var pipingCalculationsView = new PipingCalculationsView
             {
                 PipingFailureMechanism = pipingFailureMechanism,
                 AssessmentSection = assessmentSection,
-                ApplicationSelection = applicationSelection
             };
 
             // Precondition
             Assert.IsNotNull(pipingCalculationsView.PipingFailureMechanism);
             Assert.IsNotNull(pipingCalculationsView.AssessmentSection);
-            Assert.IsNotNull(pipingCalculationsView.ApplicationSelection);
 
             // Call
             pipingCalculationsView.Dispose();
 
             // Assert
             Assert.IsNull(pipingCalculationsView.PipingFailureMechanism);
             Assert.IsNull(pipingCalculationsView.AssessmentSection);
-            Assert.IsNull(pipingCalculationsView.ApplicationSelection);
         }
 
         [Test]