Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresCalculationRow.cs
===================================================================
diff -u -rfd5f9e7eb91a3e2133e7ec97d0ae02ef5b6b6bcb -rafbf903032ddbd6d714fe94615036a5d260e4cb2
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresCalculationRow.cs	(.../StabilityPointStructuresCalculationRow.cs)	(revision fd5f9e7eb91a3e2133e7ec97d0ae02ef5b6b6bcb)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/Views/StabilityPointStructuresCalculationRow.cs	(.../StabilityPointStructuresCalculationRow.cs)	(revision afbf903032ddbd6d714fe94615036a5d260e4cb2)
@@ -301,15 +301,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();
         }
 
         private void UpdateLoadSchematizationColumnStateDefinitions()