diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
index a01a96076..5df051d86 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
@@ -393,6 +393,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
             IOrderElementModel model = orderModel
                     .getOrderElementModel(currentOrderElement);
             orderElementController.openWindow(model);
+            updateNameFor(currentOrderElement);
             updateHoursFor(currentOrderElement);
             updateBudgetFor(currentOrderElement);
         }
@@ -619,6 +620,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
 
     public void refreshRow(Treeitem item) {
         try {
+            getRenderer().updateNameFor((OrderElement) item.getValue());
             getRenderer().updateHoursFor((OrderElement) item.getValue());
             getRenderer().updateBudgetFor((OrderElement) item.getValue());
             getRenderer().render(item, item.getValue());
@@ -742,4 +744,16 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
         };
     }
 
+    @Override
+    protected INameHandler<OrderElement> getNameHandler() {
+        return new INameHandler<OrderElement>() {
+
+            @Override
+            public String getNameFor(OrderElement element) {
+                return element.getName();
+            }
+
+        };
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java
index 79dbe7054..026b87ec1 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/templates/TemplatesTreeController.java
@@ -282,10 +282,23 @@ public class TemplatesTreeController extends
         };
     }
 
+    @Override
+    protected INameHandler<OrderElementTemplate> getNameHandler() {
+        return new INameHandler<OrderElementTemplate>() {
+
+            @Override
+            public String getNameFor(OrderElementTemplate element) {
+                return element.getName();
+            }
+
+        };
+    }
+
     public void refreshRow(Treeitem item) {
         try {
             OrderElementTemplate orderElement = (OrderElementTemplate) item
                     .getValue();
+            getRenderer().updateNameFor(orderElement);
             getRenderer().updateHoursFor(orderElement);
             getRenderer().updateBudgetFor(orderElement);
             getRenderer().render(item, orderElement);
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
index 28d230738..90547c137 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
@@ -858,6 +858,13 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
             }
         }
 
+        public void updateNameFor(T element) {
+            if (!readOnly) {
+                Textbox textbox = nameTextboxByElement.get(element);
+                textbox.setValue(getNameHandler().getNameFor(element));
+            }
+        }
+
         public void refreshBudgetValueForThisNodeAndParents(T node) {
             List<T> nodeAndItsParents = getModel().getParents(node);
             nodeAndItsParents.add(node);
@@ -1184,6 +1191,14 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
 
     protected abstract IBudgetHandler<T> getBudgetHandler();
 
+    public interface INameHandler<T> {
+
+        String getNameFor(T element);
+
+    }
+
+    protected abstract INameHandler<T> getNameHandler();
+
     /**
      * Disable control buttons (new, up, down, indent, unindent, delete)
      */