Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs
===================================================================
diff -u -r8f9f7129237688231085d3299354760fb761010e -rf57d1f73b93678fe4661dd0ef71d6edec587e72a
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs	(.../HeightStructuresCalculationRow.cs)	(revision 8f9f7129237688231085d3299354760fb761010e)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs	(.../HeightStructuresCalculationRow.cs)	(revision f57d1f73b93678fe4661dd0ef71d6edec587e72a)
@@ -244,15 +244,13 @@
             if (foreShoreProfileGeometry == null)
             {
                 ColumnStateHelper.DisableColumn(ColumnStateDefinitions[useBreakWaterColumnIndex]);
-                ColumnStateHelper.DisableColumn(ColumnStateDefinitions[breakWaterTypeColumnIndex]);
-                ColumnStateHelper.DisableColumn(ColumnStateDefinitions[breakWaterHeightColumnIndex]);
             }
             else
             {
                 ColumnStateHelper.EnableColumn(ColumnStateDefinitions[useBreakWaterColumnIndex]);
-                ColumnStateHelper.EnableColumn(ColumnStateDefinitions[breakWaterTypeColumnIndex]);
-                ColumnStateHelper.EnableColumn(ColumnStateDefinitions[breakWaterHeightColumnIndex]);
             }
+
+            UpdateBreakWaterTypeAndHeightColumnStateDefinitions();
         }
     }
 }
\ No newline at end of file