Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs
===================================================================
diff -u -rcf222152acdcc3cd54bf54d9473ffddaa8238c84 -raf130232784d0e332bbc4c97cd812e9750cd0f8b
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs	(.../HeightStructuresCalculationRow.cs)	(revision cf222152acdcc3cd54bf54d9473ffddaa8238c84)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs	(.../HeightStructuresCalculationRow.cs)	(revision af130232784d0e332bbc4c97cd812e9750cd0f8b)
@@ -41,6 +41,7 @@
     /// </summary>
     public class HeightStructuresCalculationRow : CalculationRow<StructuresCalculationScenario<HeightStructuresInput>>, IHasColumnStateDefinitions
     {
+        private const int useBreakWaterColumnIndex = 3;
         private const int breakWaterTypeColumnIndex = 4;
         private const int breakWaterHeightColumnIndex = 5;
         private const int useForeshoreColumnIndex = 6;
@@ -73,6 +74,7 @@
                 if (!ReferenceEquals(Calculation.InputParameters.ForeshoreProfile, valueToSet))
                 {
                     PropertyChangeHelper.ChangePropertyAndNotify(() => Calculation.InputParameters.ForeshoreProfile = valueToSet, PropertyChangeHandler);
+                    UpdateUseForeshoreColumnStateDefinitions();
                 }
             }
         }
@@ -199,6 +201,7 @@
 
         private void CreateColumnStateDefinitions()
         {
+            ColumnStateDefinitions.Add(useBreakWaterColumnIndex, new DataGridViewColumnStateDefinition());
             ColumnStateDefinitions.Add(breakWaterTypeColumnIndex, new DataGridViewColumnStateDefinition());
             ColumnStateDefinitions.Add(breakWaterHeightColumnIndex, new DataGridViewColumnStateDefinition());
             ColumnStateDefinitions.Add(useForeshoreColumnIndex, new DataGridViewColumnStateDefinition());
@@ -224,10 +227,12 @@
             if (foreShoreProfileGeometry == null || !foreShoreProfileGeometry.Geometry.Any())
             {
                 ColumnStateHelper.DisableColumn(ColumnStateDefinitions[useForeshoreColumnIndex]);
+                ColumnStateHelper.DisableColumn(ColumnStateDefinitions[useBreakWaterColumnIndex]);
             }
             else
             {
                 ColumnStateHelper.EnableColumn(ColumnStateDefinitions[useForeshoreColumnIndex]);
+                ColumnStateHelper.EnableColumn(ColumnStateDefinitions[useBreakWaterColumnIndex]);
             }
         }
     }
Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresCalculationRowTest.cs
===================================================================
diff -u -r084841826fac2142498b963305a2265119a0c774 -raf130232784d0e332bbc4c97cd812e9750cd0f8b
--- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresCalculationRowTest.cs	(.../HeightStructuresCalculationRowTest.cs)	(revision 084841826fac2142498b963305a2265119a0c774)
+++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Forms.Test/Views/HeightStructuresCalculationRowTest.cs	(.../HeightStructuresCalculationRowTest.cs)	(revision af130232784d0e332bbc4c97cd812e9750cd0f8b)
@@ -45,6 +45,7 @@
     [TestFixture]
     public class HeightStructuresCalculationRowTest
     {
+        private const int useBreakWaterTypeColumnIndex = 3;
         private const int breakWaterTypeColumnIndex = 4;
         private const int breakWaterHeightColumnIndex = 5;
         private const int useForeshoreColumnIndex = 6;
@@ -69,8 +70,9 @@
             Assert.AreSame(calculationScenario, row.Calculation);
 
             IDictionary<int, DataGridViewColumnStateDefinition> columnStateDefinitions = row.ColumnStateDefinitions;
-            Assert.AreEqual(3, columnStateDefinitions.Count);
+            Assert.AreEqual(4, columnStateDefinitions.Count);
 
+            DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, useBreakWaterTypeColumnIndex);
             DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, breakWaterTypeColumnIndex);
             DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, breakWaterHeightColumnIndex);
             DataGridViewControlColumnStateDefinitionTestHelper.AssertColumnStateDefinition(columnStateDefinitions, useForeshoreColumnIndex);