diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index c1eecd418..5c479aa28 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -804,7 +804,7 @@ class TorrentManager(component.Component):
             log.info("Saving the %s at: %s", filename, filepath)
             try:
                 with open(filepath, "wb") as _file:
-                    _file.write(lt.bencode(self.session.save_state()))
+                    _file.write(lt.bencode(self.resume_data))
                     _file.flush()
                     os.fsync(_file.fileno())
             except (IOError, EOFError) as ex:
diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index 5fa36c48a..b248122f3 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -260,7 +260,7 @@ class FilesTab(Tab):
         save_pickled_state_file("files_tab.state", state)
 
     def load_state(self):
-        state = load_pickled_state_file("files_tabs.state")
+        state = load_pickled_state_file("files_tab.state")
 
         if state == None:
             return