diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
index 825258a9b..9b8fb8d1d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
@@ -332,6 +332,10 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
         // Is already added?
         Button button = (Button) ComponentsFinder.findById("expandAllButton", children);
         if (button != null) {
+            if (button.getSclass().equals("planner-command clicked")) {
+                button.setSclass("planner-command");
+                button.invalidate();
+            }
             return;
         }