diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java
index 9a7671913..f09f7ef11 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java
@@ -290,11 +290,21 @@ public class AssignedMaterialsToOrderElementController extends
         return result;
     }
 
-    public void clearSelection(Tree tree) {
-        tree.clearSelection();
+    public void clearSelectionCategoriesTree() {
+        categoriesTree.clearSelection();
         Util.reloadBindings(gridMaterials);
     }
 
+    public void clearSelectionAllCategoriesTree() {
+        allCategoriesTree.clearSelection();
+        retrieveAllMaterials();
+        Util.reloadBindings(lbFoundMaterials);
+    }
+
+    private void retrieveAllMaterials() {
+        assignedMaterialsToOrderElementModel.searchMaterials("", null);
+    }
+
     public MaterialCategoryRenderer getMaterialCategoryRenderer() {
         return new MaterialCategoryRenderer();
     }
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
index 26bb715cd..909588bc8 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
@@ -41,7 +41,7 @@
                         <panel title="${i18n:_('Categories')}" border="normal">
                             <panelchildren>
                                 <toolbarbutton style="text-decoration: none" label="${i18n:_('Unselect')}"
-                                    onClick="assignedMaterialsController.clearSelection(categoriesTree)" />
+                                    onClick="assignedMaterialsController.clearSelectionCategoriesTree()" />
                                 <tree id="categoriesTree"
                                         fixedLayout="false"
                                         width="280px" rows="10" vflex="true" multiple="false"
@@ -120,7 +120,8 @@
                     <vbox>
                         <panel title="${i18n:_('Categories')}" border="normal">
                             <panelchildren>
-                                <toolbarbutton style="text-decoration: none" label="${i18n:_('Unselect')}" onClick="allCategoriesTree.clearSelection()" />
+                                <toolbarbutton style="text-decoration: none" label="${i18n:_('Unselect')}"
+                                    onClick="assignedMaterialsController.clearSelectionAllCategoriesTree()" />
                                 <tree id="allCategoriesTree"
                                         width="280px" rows="10" vflex="true" multiple="false">
                                     <treecols>