diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
index 6283dab45..49754bd51 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
@@ -60,6 +60,7 @@ import org.zkoss.zul.Row;
 import org.zkoss.zul.RowRenderer;
 import org.zkoss.zul.Rows;
 import org.zkoss.zul.Textbox;
+import org.zkoss.zul.api.Checkbox;
 import org.zkoss.zul.api.Window;
 
 
@@ -90,6 +91,8 @@ public class ConfigurationController extends GenericForwardComposer {
 
     private Textbox prefixBox;
 
+    private Checkbox scenariosVisible;
+
     private Map<EntityNameEnum, Boolean> mapOpenedGroups = new HashMap<EntityNameEnum, Boolean>();
 
     @Override
@@ -112,6 +115,12 @@ public class ConfigurationController extends GenericForwardComposer {
         messages = new MessagesForUser(messagesContainer);
         initOpenedGroup();
         reloadEntitySequences();
+        if (moreScenariosThanMasterCreated()) {
+            scenariosVisible.setChecked(true);
+            scenariosVisible.setDisabled(true);
+            scenariosVisible
+                    .setTooltiptext(_("Scenarios must be enabled as more elements than master exist"));
+        }
     }
 
     private void initializeProgressTypeList() {
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index 90ad15ac0..924caceae 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -182,10 +182,9 @@
                                                 checked="@{configurationController.monteCarloMethodTabVisible}" />
                                         </row>
                                         <row>
-                                            <checkbox
+                                            <checkbox id="scenariosVisible"
                                                 label="${i18n:_('Enable scenarios module')}"
-                                                checked="@{configurationController.scenariosVisible}"
-                                                disabled = "@{configurationController.moreScenariosThanMasterCreated}" />
+                                                checked = "@{configurationController.scenariosVisible}" />
                                         </row>
                                     </rows>
                                 </grid>