diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java
index b24a12165..a08aa8bdc 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/resources/entities/MachineWorkersConfigurationUnit.java
@@ -37,7 +37,8 @@ import org.libreplan.business.util.deepcopy.Strategy;
  * Machine Workers Configuration Unit<br />
  * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  */
-public class MachineWorkersConfigurationUnit extends BaseEntity {
+public class MachineWorkersConfigurationUnit extends BaseEntity implements
+        Comparable {
 
     @OnCopy(Strategy.SHARE)
     private Machine machine;
@@ -203,4 +204,11 @@ public class MachineWorkersConfigurationUnit extends BaseEntity {
         return unique;
     }
 
+    @Override
+    public int compareTo(Object configurationUnit) {
+        return this.name
+                .compareToIgnoreCase(((MachineWorkersConfigurationUnit) configurationUnit)
+                        .getName());
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineModel.java
index e682d883f..533834393 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/machine/MachineModel.java
@@ -22,6 +22,7 @@
 package org.libreplan.web.resources.machine;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -226,6 +227,7 @@ public class MachineModel extends IntegrationEntityModel implements
         if (machine != null) {
             elements.addAll(machine.getConfigurationUnits());
         }
+        Collections.sort(elements);
         return elements;
     }