diff --git a/Changelog b/Changelog
index af5a693e7..c0b102217 100644
--- a/Changelog
+++ b/Changelog
@@ -19,6 +19,7 @@
     - FEATURE: Folder scanning now works with CIFS and NFS mounted folders
     - FEATURE: Speed up qBittorrent startup
     - FEATURE: Display per-torrent peer list
+    - FEATURE: Make sure torrent files are always sorted by name
     - COSMETIC: Merged download / upload lists
     - COSMETIC: Torrents can be filtered based on their status
     - COSMETIC: Torrent properties are now displayed in main window
diff --git a/src/TorrentFilesModel.h b/src/TorrentFilesModel.h
index 3809232a6..cfed8a414 100644
--- a/src/TorrentFilesModel.h
+++ b/src/TorrentFilesModel.h
@@ -200,7 +200,13 @@ public:
     Q_ASSERT(item);
     //Q_ASSERT(!childWithName(item->getName()));
     Q_ASSERT(type != TFILE);
-    childItems.append(item);
+    int i=0;
+    for(i=0; i<childItems.size(); ++i) {
+      QString newchild_name = item->getName();
+      if(QString::localeAwareCompare(newchild_name, childItems.at(i)->getName()) < 0) break;
+    }
+    childItems.insert(i, item);
+    //childItems.append(item);
     //Q_ASSERT(type != ROOT || childItems.size() == 1);
   }