diff --git a/ChangeLog b/ChangeLog
index 1042ccf89..e92549c07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ Deluge 0.9.07 - "1.0.0_RC7" (18 August 2008)
   * Fix not showing new torrents if you don't use the All label first
   * Fix size units to be more accurate
   * Fix torrentview sorting to be persistent
+  * Fix not displaying file list when state changes
 
  Null:
   * Fix #415 crash when using 'config-set' with no parameters
diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index d5e76c4a5..24a25c830 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -249,9 +249,9 @@ class FilesTab(Tab):
             torrent_id = torrent_id[0]
         else:
             # No torrent is selected in the torrentview
-            self.treestore.clear()
+            self.clear()
             return
-        
+
         if torrent_id != self.torrent_id:
             # We only want to do this if the torrent_id has changed
             self.treestore.clear()
@@ -275,6 +275,7 @@ class FilesTab(Tab):
 
     def clear(self):
         self.treestore.clear()
+        self.torrent_id = None
 
     def _on_row_activated(self, tree, path, view_column):
         if client.is_localhost: