diff --git a/ChangeLog b/ChangeLog
index 637d1cb5e..8238953c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Deluge 0.9.07 - "1.0.0_RC7" (In Development)
   * Fix Vista slowness issue
  GtkUI:
   * Add 'edit' to edit trackers dialog
+  * Improve performance of initial torrent list load
   
 Deluge 0.9.06 - "1.0.0_RC6" (13 August 2008)
  Core:
diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index d926a8c31..6f7a55974 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -205,7 +205,7 @@ class TorrentView(listview.ListView, component.Component):
 
     def _on_session_state(self, state):
         for torrent_id in state:
-            self.add_row(torrent_id)
+            self.add_row(torrent_id, update=False)
         
         self.update_filter()    
         self.update()
@@ -360,7 +360,7 @@ class TorrentView(listview.ListView, component.Component):
         if self.status != {}:
             self.update_view()
         
-    def add_row(self, torrent_id):
+    def add_row(self, torrent_id, update=True):
         """Adds a new torrent row to the treeview"""
         # Insert a new row to the liststore
         row = self.liststore.append()
@@ -369,8 +369,9 @@ class TorrentView(listview.ListView, component.Component):
                     row,
                     self.columns["torrent_id"].column_indices[0], 
                     torrent_id)
-        self.update()
-        self.update_filter()
+        if update:
+            self.update()
+            self.update_filter()
         
     def remove_row(self, torrent_id):
         """Removes a row with torrent_id"""