diff --git a/securedrop_client/db.py b/securedrop_client/db.py
index 92e29ed87..93f6aed31 100644
--- a/securedrop_client/db.py
+++ b/securedrop_client/db.py
@@ -61,7 +61,7 @@ def collection(self):
         collection.extend(self.messages)
         collection.extend(self.files)
         collection.extend(self.replies)
-        collection.sort(key=lambda x: int(x.filename.split('-')[0]))
+        collection.sort(key=lambda x: x.file_counter)
         return collection