diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
index 2fe79bd4d..31456bdc6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
@@ -125,16 +125,16 @@ public class WorkerSearchController extends GenericForwardComposer {
      * @param criterions
      */
     private void searchWorkers(String name, List<Criterion> criterions) {
-        if (name == null || name.length() == 0) {
+        // No text, and no criterions selected
+        if (criterions.isEmpty()
+                && (name == null || name.isEmpty())) {
             refreshListBoxWorkers(workerSearchModel.getAllWorkers());
             return;
         }
 
-        List<Worker> listWorkers = workerSearchModel.findWorkers(name,
-                getSelectedCriterions());
-        refreshListBoxWorkers(listWorkers
-                .toArray(new Worker[listWorkers
-                .size()]));
+        final List<Worker> listWorkers = workerSearchModel.findWorkers(name,
+                criterions);
+        refreshListBoxWorkers(listWorkers);
     }
 
     /**