diff --git a/src/torrentcontentfiltermodel.cpp b/src/torrentcontentfiltermodel.cpp
index 6e2627e08..f68fa2479 100644
--- a/src/torrentcontentfiltermodel.cpp
+++ b/src/torrentcontentfiltermodel.cpp
@@ -81,6 +81,24 @@ bool TorrentContentFilterModel::filterAcceptsRow(int source_row, const QModelInd
   return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent);
 }
 
+bool TorrentContentFilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) const {
+  if (sortColumn() == NAME) {
+    QVariant vL = sourceModel()->data(left);
+    QVariant vR = sourceModel()->data(right);
+    if (!(vL.isValid() && vR.isValid()))
+      return QSortFilterProxyModel::lessThan(left, right);
+    Q_ASSERT(vL.isValid());
+    Q_ASSERT(vR.isValid());
+
+    bool res = false;
+    if (misc::naturalSort(vL.toString(), vR.toString(), res))
+      return res;
+
+    return QSortFilterProxyModel::lessThan(left, right);
+  }
+  return QSortFilterProxyModel::lessThan(left, right);
+}
+
 void TorrentContentFilterModel::selectAll()
 {
   for (int i=0; i<rowCount(); ++i) {
diff --git a/src/torrentcontentfiltermodel.h b/src/torrentcontentfiltermodel.h
index b6c88ac3c..0fba55239 100644
--- a/src/torrentcontentfiltermodel.h
+++ b/src/torrentcontentfiltermodel.h
@@ -33,6 +33,7 @@
 
 #include <QSortFilterProxyModel>
 #include "torrentcontentmodelitem.h"
+#include "proplistdelegate.h"
 
 class TorrentContentModel;
 
@@ -53,6 +54,7 @@ signals:
 
 protected:
   virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const;
+  virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
 
 public slots:
   void selectAll();