diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js
index 164753354..86f8c75f8 100644
--- a/client/components/cards/checklists.js
+++ b/client/components/cards/checklists.js
@@ -111,7 +111,7 @@ BlazeComponent.extendComponent({
         title,
         checklistId: checklist._id,
         cardId: checklist.cardId,
-        sort: checklist.itemCount(),
+        sort: Utils.calculateIndexData(checklist.lastItem()).base,
       });
     }
     // We keep the form opened, empty it.
diff --git a/models/checklists.js b/models/checklists.js
index cbf7d6d9c..fbc82610d 100644
--- a/models/checklists.js
+++ b/models/checklists.js
@@ -91,6 +91,11 @@ Checklists.helpers({
       { sort: ['sort'] },
     );
   },
+  lastItem() {
+    const allItems = this.items().fetch();
+    const ret = allItems[allItems.length - 1];
+    return ret;
+  },
   finishedCount() {
     return ChecklistItems.find({
       checklistId: this._id,