diff --git a/Changelog b/Changelog
index 41bbb97be..fc841a8ab 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,7 @@
     - BUGFIX: Fix link to plugins.qbittorrent.org in plugins dialog
     - BUGFIX: ~/qBT_dir is created only when it is actually used
     - BUGFIX: Fix possible missing slot message (toggleSelectedTorrentsSuperSeeding)
+    - BUGFIX: Fix possible crash in torrent properties (files)
 
 * Thu Dec 10 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.0
     - FEATURE: Added program option to disable splash screen
diff --git a/src/propertieswidget.cpp b/src/propertieswidget.cpp
index ce2a2bb20..f9a66adab 100644
--- a/src/propertieswidget.cpp
+++ b/src/propertieswidget.cpp
@@ -362,7 +362,12 @@ void PropertiesWidget::loadDynamicData() {
     }
     if(stackedProperties->currentIndex() == FILES_TAB) {
       // Files progress
-      if(h.has_metadata()) {
+      if(h.is_valid() && h.has_metadata()) {
+        if(PropListModel->rowCount() == 0) {
+          PropListModel->setupModelData(h.get_torrent_info());
+          // Expand first item if possible
+          filesList->expand(PropListModel->index(0, 0));
+        }
         std::vector<size_type> fp;
         h.file_progress(fp);
         PropListModel->updateFilesPriorities(h.file_priorities());