diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/IOrderTemplatesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/IOrderTemplatesModel.java
index 30acba987..ed40955b7 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/IOrderTemplatesModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/IOrderTemplatesModel.java
@@ -37,4 +37,6 @@ public interface IOrderTemplatesModel {
     OrderElementTemplate getTemplate();
 
     void confirmSave();
+
+    void initEdit(OrderElementTemplate template);
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java
index e9ea90456..e3e2a621d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java
@@ -79,6 +79,11 @@ public class OrderTemplatesController extends GenericForwardComposer implements
         show(getEditWindow());
     }
 
+    public void goToEditForm(OrderElementTemplate template) {
+        model.initEdit(template);
+        show(getEditWindow());
+    }
+
     private void show(Component window) {
         Util.reloadBindings(window);
         getVisibility().showOnly(window);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java
index 83900a62c..6a0db5f4c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesModel.java
@@ -79,4 +79,10 @@ public class OrderTemplatesModel implements IOrderTemplatesModel {
         }
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public void initEdit(OrderElementTemplate template) {
+        this.template = dao.findExistingEntity(template.getId());
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/templates/_list.zul b/navalplanner-webapp/src/main/webapp/templates/_list.zul
index 5cca4fb8b..a687a5b7d 100644
--- a/navalplanner-webapp/src/main/webapp/templates/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/templates/_list.zul
@@ -39,6 +39,12 @@
                 <label value="@{template.deadlineAsDaysFromBeginning}" />
                 <label value="@{template.description}" />
                 <hbox>
+                    <button sclass="icono"
+                        image="/common/img/ico_editar1.png"
+                        hoverImage="/common/img/ico_editar.png"
+                        tooltiptext="${i18n:_('Edit')}"
+                        onClick="templateController.goToEditForm(self.parent.parent.value);">
+                    </button>
                 </hbox>
             </row>
         </rows>