Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r1e096895772e9946fe12cd79003d895e094b5d4b -r7abe36a7f4949221955e0c974564f61c1350e81c
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 1e096895772e9946fe12cd79003d895e094b5d4b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 7abe36a7f4949221955e0c974564f61c1350e81c)
@@ -440,23 +440,25 @@
 
             yield return new TreeNodeInfo<DesignWaterLevelContext>
             {
-                Text =  designWaterLevel => RingtoetsFormsResources.DesignWaterLevel_DisplayName,
+                Text = designWaterLevel => RingtoetsFormsResources.DesignWaterLevel_DisplayName,
                 Image = designWaterLevel => RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 CanRename = (context, o) => false,
-                ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase == null ?
-                                           Color.FromKnownColor(KnownColor.GrayText) :
-                                           Color.FromKnownColor(KnownColor.ControlText),
+                ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase != null &&
+                                       context.WrappedData.HydraulicBoundaryDatabase.Locations.Any(l => !double.IsNaN(l.DesignWaterLevel)) ?
+                                           Color.FromKnownColor(KnownColor.ControlText) :
+                                           Color.FromKnownColor(KnownColor.GrayText),
                 ContextMenuStrip = DesignWaterLevelContextMenuStrip
             };
-            
+
             yield return new TreeNodeInfo<WaveHeightContext>
             {
                 Text = waveHeight => RingtoetsFormsResources.WaveHeightContext_DisplayName,
                 Image = waveHeight => RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 CanRename = (context, o) => false,
-                ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase == null ?
-                                           Color.FromKnownColor(KnownColor.GrayText) :
-                                           Color.FromKnownColor(KnownColor.ControlText),
+                ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase != null &&
+                                       context.WrappedData.HydraulicBoundaryDatabase.Locations.Any(l => !double.IsNaN(l.WaveHeight)) ?
+                                           Color.FromKnownColor(KnownColor.ControlText) :
+                                           Color.FromKnownColor(KnownColor.GrayText),
                 ContextMenuStrip = WaveHeightContextMenuStrip
             };
 
@@ -1068,6 +1070,8 @@
                       .AddSeparator()
                       .AddExpandAllItem()
                       .AddCollapseAllItem()
+                      .AddSeparator()
+                      .AddPropertiesItem()
                       .Build();
         }