diff --git a/Changelog b/Changelog
index 236c94654..0ead1bcb6 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.4.6
     - BUGFIX: Fix "torrent seeding after creation" feature
+    - BUGFIX: The properties panel data would sometimes not match the selected torrent
 
 * Tue Oct 12 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.5
     - BUGFIX: Remember torrent completion date correctly
diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp
index d112ccab4..0e1d421ea 100644
--- a/src/transferlistwidget.cpp
+++ b/src/transferlistwidget.cpp
@@ -1486,7 +1486,9 @@ void TransferListWidget::applyStatusFilter(int f) {
     statusFilterModel->setFilterRegExp(QRegExp());
   }
   // Select first item if nothing is selected
-  if(selectionModel()->selectedRows(0).empty() && statusFilterModel->rowCount() > 0)
-    selectionModel()->setCurrentIndex(statusFilterModel->index(0, TR_NAME), QItemSelectionModel::SelectCurrent|QItemSelectionModel::Rows);
+  if(selectionModel()->selectedRows(0).empty() && nameFilterModel->rowCount() > 0) {
+    qDebug("Nothing is selected, selecting first row: %s", qPrintable(nameFilterModel->index(0, TR_NAME).data().toString()));
+    selectionModel()->setCurrentIndex(nameFilterModel->index(0, TR_NAME), QItemSelectionModel::SelectCurrent|QItemSelectionModel::Rows);
+  }
 }