Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs
===================================================================
diff -u -r2f88c408f6c51e0559eb5e73c25e0dfc2f874c69 -rbb9d9a8a941eeace0951a34b5f502915a04f454b
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs	(.../MacroStabilityOutwardsSectionResultRow.cs)	(revision 2f88c408f6c51e0559eb5e73c25e0dfc2f874c69)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRow.cs	(.../MacroStabilityOutwardsSectionResultRow.cs)	(revision bb9d9a8a941eeace0951a34b5f502915a04f454b)
@@ -335,10 +335,10 @@
         {
             bool simpleAssessmentSufficient = GetSimpleAssessmentSufficient();
 
-            SetColumnState(detailedAssessmentResultIndex, simpleAssessmentSufficient);
-            SetColumnState(detailedAssessmentProbabilityIndex, simpleAssessmentSufficient || GetDetailedAssessmentResultIsNotProbability());
-            SetColumnState(tailorMadeAssessmentResultIndex, simpleAssessmentSufficient);
-            SetColumnState(tailorMadeAssessmentProbabilityIndex, simpleAssessmentSufficient || GetTailorMadeAssessmentResultIsNotProbability());
+            SetColumnState(detailedAssessmentResultIndex, simpleAssessmentSufficient || UseManualAssemblyCategoryGroup);
+            SetColumnState(detailedAssessmentProbabilityIndex, simpleAssessmentSufficient || GetDetailedAssessmentResultIsNotProbability() || UseManualAssemblyCategoryGroup);
+            SetColumnState(tailorMadeAssessmentResultIndex, simpleAssessmentSufficient || UseManualAssemblyCategoryGroup);
+            SetColumnState(tailorMadeAssessmentProbabilityIndex, simpleAssessmentSufficient || GetTailorMadeAssessmentResultIsNotProbability() || UseManualAssemblyCategoryGroup);
 
             SetColumnState(manualAssemblyCategoryGroupIndex, !UseManualAssemblyCategoryGroup);
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs
===================================================================
diff -u -r2f88c408f6c51e0559eb5e73c25e0dfc2f874c69 -rbb9d9a8a941eeace0951a34b5f502915a04f454b
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs	(.../MacroStabilityOutwardsSectionResultRowTest.cs)	(revision 2f88c408f6c51e0559eb5e73c25e0dfc2f874c69)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/MacroStabilityOutwardsSectionResultRowTest.cs	(.../MacroStabilityOutwardsSectionResultRowTest.cs)	(revision bb9d9a8a941eeace0951a34b5f502915a04f454b)
@@ -161,7 +161,7 @@
                 AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.DetailedAssemblyCategoryGroupIndex]);
                 AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.TailorMadeAssemblyCategoryGroupIndex]);
                 AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.CombinedAssemblyCategoryGroupIndex]);
-                AssertColumnStateIsEnabled(columnStateDefinitions[ConstructionProperties.ManualAssemblyCategoryGroupIndex]);
+                AssertColumnStateIsDisabled(columnStateDefinitions[ConstructionProperties.ManualAssemblyCategoryGroupIndex]);
 
                 Assert.AreEqual(result.SimpleAssessmentResult, row.SimpleAssessmentResult);
                 Assert.AreEqual(result.DetailedAssessmentResult, row.DetailedAssessmentResult);
@@ -322,7 +322,7 @@
         [TestCase(DetailedAssessmentResultType.NotAssessed, false)]
         [TestCase(DetailedAssessmentResultType.Probability, true)]
         public void Constructor_WithDetailedAssessmentResultSet_ExpectedColumnStates(DetailedAssessmentResultType detailedAssessmentResult,
-                                                                               bool cellEnabled)
+                                                                                     bool cellEnabled)
         {
             // Setup
             var failureMechanism = new MacroStabilityOutwardsFailureMechanism();
@@ -359,7 +359,7 @@
         [TestCase(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Probability, true)]
         public void Constructor_WithTailorMadeAssessmentResultSet_ExpectedColumnStates(
             TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult,
-                                                                                       bool cellEnabled)
+            bool cellEnabled)
         {
             // Setup
             var failureMechanism = new MacroStabilityOutwardsFailureMechanism();
@@ -403,6 +403,7 @@
             FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection();
             var result = new MacroStabilityOutwardsFailureMechanismSectionResult(section)
             {
+                TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.Probability,
                 UseManualAssemblyCategoryGroup = useManualAssemblyCategoryGroup
             };
 
@@ -415,6 +416,10 @@
                 // Assert
                 IDictionary<int, DataGridViewColumnStateDefinition> columnStateDefinitions = row.ColumnStateDefinitions;
 
+                AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentResultIndex], !useManualAssemblyCategoryGroup);
+                AssertColumnState(columnStateDefinitions[ConstructionProperties.DetailedAssessmentProbabilityIndex], !useManualAssemblyCategoryGroup);
+                AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentResultIndex], !useManualAssemblyCategoryGroup);
+                AssertColumnState(columnStateDefinitions[ConstructionProperties.TailorMadeAssessmentProbabilityIndex], !useManualAssemblyCategoryGroup);
                 AssertColumnState(columnStateDefinitions[ConstructionProperties.ManualAssemblyCategoryGroupIndex], useManualAssemblyCategoryGroup);
 
                 mocks.VerifyAll();