diff --git a/ChangeLog b/ChangeLog
index 52de8c21a..8a1e42cbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Deluge 1.1.1 - (In Development)
  GtkUI:
   * Fix opening links from Help menu and others
   * Fix remembering sorted column in the torrent list
+  * Fix saving Files tab and Peers tab state
 
  Misc:
   * Fix bdecoding some torrent files
diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index ea2fc3dd1..e0ba54cee 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -212,7 +212,7 @@ class FilesTab(Tab):
         state = {
             "columns": {},
             "sort_id": column_id,
-            "sort_order": sort_order
+            "sort_order": int(sort_order)
         }
 
         for index, column in enumerate(self.listview.get_columns()):
diff --git a/deluge/ui/gtkui/peers_tab.py b/deluge/ui/gtkui/peers_tab.py
index 9a3cd1752..d37c0b68c 100644
--- a/deluge/ui/gtkui/peers_tab.py
+++ b/deluge/ui/gtkui/peers_tab.py
@@ -166,7 +166,7 @@ class PeersTab(Tab):
         state = {
             "columns": {},
             "sort_id": column_id,
-            "sort_order": sort_order
+            "sort_order": int(sort_order)
         }
 
         for index, column in enumerate(self.listview.get_columns()):