diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
index 7b61f9fa9..c534e48c2 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
@@ -538,6 +538,14 @@ public class Planner extends HtmlMacroComponent  {
         }
     }
 
+    public void expandAllAlways() {
+        Button expandAllButton = (Button) getFellow("expandAll");
+        if (disabilityConfiguration.isExpandAllEnabled()) {
+                context.expandAll();
+                expandAllButton.setSclass("planner-command clicked");
+        }
+    }
+
     public void updateSelectedZoomLevel() {
         if (!isFixedZoomByUser()) {
             Listitem selectedItem = (Listitem) listZoomLevels.getItems().get(
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
index b09f87c22..68bba88c7 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
@@ -292,7 +292,7 @@ public class OrderPlanningController implements Composer {
     public void showResorceAllocationIfIsNeeded() {
         if ((task != null) && (planner != null)) {
 
-            planner.expandAll();
+            planner.expandAllAlways();
 
             Task foundTask = null;
             TaskElement foundTaskElement = null;