diff --git a/Changelog b/Changelog
index b26b62638..f01e4f092 100644
--- a/Changelog
+++ b/Changelog
@@ -7,6 +7,7 @@
     - FEATURE: Added option to bypass Web UI authentication for localhost
     - FEATURE: Added option to disable program exit confirmation
     - FEATURE: Added per-torrent ratio limiting (Christian Kandeler)
+    - FEATURE: Torrent content list is now sortable
     - BUGFIX: Fix compilation with namespaced Qt (Christian Kandeler)
     - OTHER: Make QtDBus dependency optional (X11)
 
diff --git a/src/properties/propertieswidget.cpp b/src/properties/propertieswidget.cpp
index d9d670b41..e30f8269c 100644
--- a/src/properties/propertieswidget.cpp
+++ b/src/properties/propertieswidget.cpp
@@ -77,6 +77,7 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow* main_window, Tra
   filesList->setModel(PropListModel);
   PropDelegate = new PropListDelegate(this);
   filesList->setItemDelegate(PropDelegate);
+  filesList->setSortingEnabled(true);
   // Torrent content filtering
   m_contentFilerLine = new LineEdit(this);
   connect(m_contentFilerLine, SIGNAL(textChanged(QString)), PropListModel, SLOT(setFilterFixedString(QString)));
diff --git a/src/torrentadditiondlg.ui b/src/torrentadditiondlg.ui
index d3f131f88..ae3a4f1a3 100644
--- a/src/torrentadditiondlg.ui
+++ b/src/torrentadditiondlg.ui
@@ -205,12 +205,15 @@
      <property name="contextMenuPolicy">
       <enum>Qt::CustomContextMenu</enum>
      </property>
-     <property name="editTriggers">
-      <set>QAbstractItemView::AllEditTriggers</set>
-     </property>
      <property name="selectionMode">
       <enum>QAbstractItemView::ExtendedSelection</enum>
      </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="allColumnsShowFocus">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item>