diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index 74f44a4fd..48e8f9281 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -264,4 +264,9 @@ public class OrderCRUDController extends GenericForwardComposer {
         return confirmingSchedule;
     }
 
+    public void setPlanningControllerEntryPoints(
+            IOrderPlanningControllerEntryPoints planningControllerEntryPoints) {
+        this.planningControllerEntryPoints = planningControllerEntryPoints;
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
index 6d74b67ad..9e39eb94f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
@@ -30,6 +30,7 @@ import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.web.common.Util;
 import org.navalplanner.web.orders.OrderCRUDController;
 import org.navalplanner.web.planner.CompanyPlanningController;
+import org.navalplanner.web.planner.IOrderPlanningControllerEntryPoints;
 import org.navalplanner.web.planner.tabs.CreatedOnDemandTab.IComponentCreator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -192,7 +193,7 @@ public class MultipleTabsPlannerController {
             public org.zkoss.zk.ui.Component create(
                     org.zkoss.zk.ui.Component parent) {
                 Map<String, Object> args = new HashMap<String, Object>();
-                args.put("orderController", orderCRUDController);
+                args.put("orderController", setupOrderCrudController());
                 org.zkoss.zk.ui.Component result = Executions.createComponents(
                         "/orders/_ordersTab.zul", parent, args);
                 createBindingsFor(result);
@@ -203,6 +204,18 @@ public class MultipleTabsPlannerController {
         });
     }
 
+    private OrderCRUDController setupOrderCrudController() {
+        orderCRUDController.setPlanningControllerEntryPoints(new IOrderPlanningControllerEntryPoints() {
+
+            @Override
+            public void showSchedule(Order order) {
+                mode.goToOrderMode(order);
+
+            }
+        });
+        return orderCRUDController;
+    }
+
     @SuppressWarnings("unchecked")
     private void createBindingsFor(org.zkoss.zk.ui.Component result) {
         List<org.zkoss.zk.ui.Component> children = new ArrayList<org.zkoss.zk.ui.Component>(