Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r560 -r609
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 560)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 609)
@@ -262,6 +262,40 @@
             Assert.IsTrue(isVisible != null && isVisible.Value);
         }
 
+        [TestCase("AbovePhreaticLevel")]
+        [TestCase("BelowPhreaticLevel")]
+        [TestCase("Cohesion")]
+        [TestCase("FrictionAngle")]
+        [TestCase("DiameterD70")]
+        [TestCase("PermeabKx")]
+        [TestCase("StrengthIncreaseExponent")]
+        [TestCase("RatioCuPc")]
+        [TestCase("POP")]
+        public void DSoilModelContext_ParameterViewForSoil_VisibleEnabled(string memberName)
+        {
+            var dSoilModelContext = SetupDSoilModelContext(null);
+            var soil = new Soil();
+            var stochastName = memberName + "Stochast";
+
+            dSoilModelContext.ParameterView = ParameterViewSettings.AllParameters;
+            Assert.AreEqual(true, dSoilModelContext.IsVisible(soil, memberName));
+            Assert.AreEqual(true, dSoilModelContext.IsVisible(soil, stochastName));
+            Assert.AreEqual(true, dSoilModelContext.IsEnabled(soil, memberName));
+            Assert.AreEqual(true, dSoilModelContext.IsEnabled(soil, stochastName));
+
+            dSoilModelContext.ParameterView = ParameterViewSettings.AsIsParameters;
+            Assert.AreEqual(true, dSoilModelContext.IsVisible(soil, memberName));
+            Assert.AreEqual(false, dSoilModelContext.IsVisible(soil, stochastName));
+            Assert.AreEqual(true, dSoilModelContext.IsEnabled(soil, memberName));
+            Assert.AreEqual(false, dSoilModelContext.IsEnabled(soil, stochastName));
+            
+            dSoilModelContext.ParameterView = ParameterViewSettings.ProbabilisticParameters;
+            Assert.AreEqual(false, dSoilModelContext.IsVisible(soil, memberName));
+            Assert.AreEqual(true, dSoilModelContext.IsVisible(soil, stochastName));
+            Assert.AreEqual(false, dSoilModelContext.IsEnabled(soil, memberName));
+            Assert.AreEqual(true, dSoilModelContext.IsEnabled(soil, stochastName));
+        }
+
         [Test]
         public void DSoilModelContext_Mainform_InvisibleItems()
         {
Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs
===================================================================
diff -u -r603 -r609
--- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 603)
+++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 609)
@@ -333,7 +333,7 @@
                         return false;
                     }
                 }
-                if (!alwaysVisibleProperties.Contains(member))
+                else if (!alwaysVisibleProperties.Contains(member))
                 {
                     if (ParameterView == ParameterViewSettings.ProbabilisticParameters)
                     {