diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
index 6358fd7ec..3b82da5c9 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
@@ -30,6 +30,7 @@ import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Button;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Combobox;
+import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Intbox;
 import org.zkoss.zul.Label;
 import org.zkoss.zul.Listcell;
@@ -417,19 +418,20 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
                     .getFellow("parentCalendars");
         }
 
-        markSelectedParentCombo(parentCalendars);
+        fillParentCombo(parentCalendars);
         addListenerParentCombo(parentCalendars);
     }
 
-    private void markSelectedParentCombo(final Combobox parentCalendars) {
+    private void fillParentCombo(Combobox parentCalendars) {
         BaseCalendar parent = baseCalendarModel.getParent();
 
         List<BaseCalendar> possibleParentCalendars = getParentCalendars();
         for (BaseCalendar baseCalendar : possibleParentCalendars) {
+            Comboitem item = new Comboitem(baseCalendar.getName());
+            item.setValue(baseCalendar);
+            parentCalendars.appendChild(item);
             if (baseCalendar.getId().equals(parent.getId())) {
-                parentCalendars.setSelectedIndex(possibleParentCalendars
-                        .indexOf(baseCalendar));
-                break;
+                parentCalendars.setSelectedItem(item);
             }
         }
     }
diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
index af60bb2a0..41546e476 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
@@ -29,7 +29,6 @@
             <label value="@{controller.calendarType}" />
             <combobox id="parentCalendars"
                 visible="@{controller.isDerived}"
-                model="@{controller.parentCalendars}"
                 disabled="@{controller.isViewingHistory}">
                 <comboitem self="@{each='baseCalnedar'}" value="@{baseCalnedar}"
                     label="@{baseCalnedar.name}" />