diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
index aa4fa8ee6..2ec607de0 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
@@ -19,7 +19,9 @@ import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.InputEvent;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
+import org.zkoss.zul.Column;
 import org.zkoss.zul.Grid;
+import org.zkoss.zul.ListModelExt;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Row;
 import org.zkoss.zul.Rows;
@@ -209,6 +211,29 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
     public void createLabel() {
         labelTypeModel.addLabel();
         Util.reloadBindings(gridLabels);
+        // After adding a new row, model might be disordered, so we force it to
+        // sort again respecting previous settings
+        forceSortGridLabels();
+    }
+
+    /**
+     * Sorts {@link Grid} model by first column, respecting sort order
+     * 
+     * FIXME: This is a temporary solution, there should be a better/smarter way
+     * of preserving order in the Grid every time a new element is added to its
+     * model
+     */
+    private void forceSortGridLabels() {
+        Column column = (Column) gridLabels.getColumns().getFirstChild();
+        ListModelExt model = (ListModelExt) gridLabels.getModel();
+        if ("ascending".equals(column.getSortDirection())) {
+            model.sort(column.getSortAscending(), true);
+            return;
+        }
+        if ("descending".equals(column.getSortDirection())) {
+            model.sort(column.getSortDescending(), false);
+            return;
+        }
     }
 
     public void onChangeLabelName(Event e) {
diff --git a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
index 29a9406f9..57aee3c9d 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
@@ -26,7 +26,7 @@
             <grid id="gridLabels" height="320px"
                 model="@{controller.labels}">
                  <columns sizable="true">
-                     <column label="${i18n:_('Name')}" sort="auto(name)" />
+                     <column label="${i18n:_('Name')}" sort="auto(name)" sortDirection="ascending" />
                      <column label="${i18n:_('Operations')}" />
                  </columns>
                  <rows>