diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py
index 7605279cc..2d3461a6d 100644
--- a/deluge/ui/gtkui/torrentview.py
+++ b/deluge/ui/gtkui/torrentview.py
@@ -350,14 +350,14 @@ class TorrentView(listview.ListView, component.Component):
 
     def shutdown(self):
         """Called when GtkUi is exiting"""
-        if self.window.visible():
-            self.save_state()
+        self.save_state()
 
     def save_state(self):
         """
         Saves the state of the torrent view.
         """
-        listview.ListView.save_state(self, "torrentview.state")
+        if self.window.visible():
+            listview.ListView.save_state(self, "torrentview.state")
 
     def remove_column(self, header):
         """Removes the column with the name 'header' from the torrentview"""