diff --git a/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js b/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js
index 4d36cd007b..38ae448720 100644
--- a/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js
+++ b/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js
@@ -102,6 +102,7 @@
                         pap: 2,
                         tlp: 2
                     });
+                    self.template.tasks = _.sortBy(self.template.tasks, 'order');
                     self.tags = UtilsSrv.objectify(self.template.tags, 'text');
                     self.templateCustomFields = getTemplateCustomFields(template.customFields);
 
@@ -154,7 +155,7 @@
                     var order = self.template.tasks ? self.template.tasks.length : 0;
 
                     self.openTaskDialog({
-                        order: order                        
+                        order: order
                     }, 'Add');
                 };
 
@@ -321,7 +322,7 @@
             controllerAs: '$vm',
             templateUrl: 'views/components/org/case-template/case-templates.html',
             bindings: {
-                templates: '<',
+                templates: '=',
                 fields: '<',
                 onReload: '&',
                 onEdit: '&'
diff --git a/frontend/app/views/components/org/case-template/tasks.html b/frontend/app/views/components/org/case-template/tasks.html
index c8047fde24..6508fee37d 100644
--- a/frontend/app/views/components/org/case-template/tasks.html
+++ b/frontend/app/views/components/org/case-template/tasks.html
@@ -9,9 +9,8 @@ <h4 class="vpad10 text-primary">
     <div class="empty-message" ng-if="!$vm.template.tasks || $vm.template.tasks.length === 0">
         No tasks have been specified. <a href class="mr-xxxs" ng-click="$vm.addTask()">Add a task</a>
     </div>
-
     <div ng-if="$vm.template.tasks.length !== 0" ui-sortable="$vm.sortableOptions" ng-model="$vm.template.tasks">
-        <div class="task-item" ng-init="isCollapsed=true" ng-repeat="t in $vm.template.tasks | orderBy:'order'">
+        <div class="task-item" ng-init="isCollapsed=true" ng-repeat="t in $vm.template.tasks | orderBy:'order' track by $index">
             <div class="panel-heading">
                 <span class="drag-handle text-primary clickable mr-xxs">
                     <i class="fa fa-bars"></i>