Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rc4712d739e9e7bcb62b21cdf1592b3ed0a74a7ec -rd7e204007a0a9e73fdfec7e570a397d4c41a463b
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision c4712d739e9e7bcb62b21cdf1592b3ed0a74a7ec)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision d7e204007a0a9e73fdfec7e570a397d4c41a463b)
@@ -312,6 +312,7 @@
                     return context.WrappedData.HydraulicBoundaryDatabase.Locations;
                 },
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
+                CloseForData = CloseDesignWaterLevelLocationsViewForData,
                 AfterCreate = (view, context) =>
                 {
                     view.AssessmentSection = context.WrappedData;
@@ -332,6 +333,7 @@
                     return context.WrappedData.HydraulicBoundaryDatabase.Locations;
                 },
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
+                CloseForData = CloseWaveHeightLocationsViewForData,
                 AfterCreate = (view, context) =>
                 {
                     view.AssessmentSection = context.WrappedData;
@@ -776,6 +778,30 @@
 
         #endregion
 
+        #region DesignWaterLevelLocationsView ViewInfo
+
+        private bool CloseDesignWaterLevelLocationsViewForData(DesignWaterLevelLocationsView view, object dataToCloseFor)
+        {
+            var viewData = view.AssessmentSection;
+            var assessmentSection = dataToCloseFor as IAssessmentSection;
+
+            return assessmentSection != null && ReferenceEquals(viewData, assessmentSection);
+        }
+
+        #endregion
+
+        #region WaveHeightLocationsView ViewInfo
+
+        private bool CloseWaveHeightLocationsViewForData(WaveHeightLocationsView view, object dataToCloseFor)
+        {
+            var viewData = view.AssessmentSection;
+            var assessmentSection = dataToCloseFor as IAssessmentSection;
+
+            return assessmentSection != null && ReferenceEquals(viewData, assessmentSection);
+        }
+
+        #endregion
+
         #region FailureMechanismSectionsContext
 
         private ContextMenuStrip FailureMechanismSectionsContextMenuStrip(FailureMechanismSectionsContext nodeData, object parentData, TreeViewControl treeViewControl)