Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs
===================================================================
diff -u -r31f15505b25fe2a395262b141be3be8215ccb300 -r36a0cf79588c3a06c0091e030f5b8fcc1b945a4d
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs	(.../HeightStructuresCalculationRow.cs)	(revision 31f15505b25fe2a395262b141be3be8215ccb300)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs	(.../HeightStructuresCalculationRow.cs)	(revision 36a0cf79588c3a06c0091e030f5b8fcc1b945a4d)
@@ -243,10 +243,14 @@
             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]);
             }
         }
     }