Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r6f741425dc85f3d9d868d76002a92aa9bd3cb6cb -r7057fbcd8621dc714af88e47454b9af566e769de
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 6f741425dc85f3d9d868d76002a92aa9bd3cb6cb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 7057fbcd8621dc714af88e47454b9af566e769de)
@@ -289,18 +289,15 @@
                 }
             };
 
-            yield return new ViewInfo<DesignWaterLevelLocationsContext, HydraulicBoundaryDatabase, HydraulicBoundaryLocationDesignWaterLevelsView>
+            yield return new ViewInfo<DesignWaterLevelLocationsContext, IAssessmentSection, HydraulicBoundaryLocationDesignWaterLevelsView>
             {
                 GetViewName = (v, o) => RingtoetsFormsResources.DesignWaterLevel_DisplayName,
-                GetViewData = context => context.WrappedData.HydraulicBoundaryDatabase,
-                AdditionalDataCheck = context => context.WrappedData.HydraulicBoundaryDatabase != null,
+                GetViewData = context => context.WrappedData,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                CloseForData = CloseHydraulicBoundaryLocationsViewForData,
                 AfterCreate = (view, context) =>
                 {
                     view.ApplicationSelection = Gui;
                     view.CalculationCommandHandler = new CalculateDesignWaterLevelCommandHandler(Gui.MainWindow, context.WrappedData);
-                    view.AssessmentSection = context.WrappedData;
                 }
             };
 
@@ -1020,12 +1017,6 @@
 
         #region HydraulicBoundaryDatabase
 
-        private static bool CloseHydraulicBoundaryLocationsViewForData(HydraulicBoundaryLocationDesignWaterLevelsView view, object o)
-        {
-            var assessmentSection = o as IAssessmentSection;
-            return assessmentSection != null && assessmentSection == view.AssessmentSection && assessmentSection.HydraulicBoundaryDatabase == view.Data;
-        }
-
         private static object[] HydraulicBoundaryDatabaseChildNodeObjects(HydraulicBoundaryDatabaseContext nodeData)
         {
             if (nodeData.WrappedData.HydraulicBoundaryDatabase == null)