diff --git a/ChangeLog b/ChangeLog
index a310d3e45..17b40502e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 	* Attempt to register as the default magnet uri handler in GNOME on startup
 	* Properly show 100.00% and reduce number of progress bar updates during a torrent creation
 	* Fix crash in Windows when creating a torrent
+
+==== Label ====
+	* Fix #1085 only use ints for specific options to prevent unhandled exception
 	
 === Deluge 1.2.0_rc4 (24 November 2009) ===
 ==== Core ====
diff --git a/deluge/plugins/label/label/gtkui/sidebar_menu.py b/deluge/plugins/label/label/gtkui/sidebar_menu.py
index d489c8820..acbd9b591 100644
--- a/deluge/plugins/label/label/gtkui/sidebar_menu.py
+++ b/deluge/plugins/label/label/gtkui/sidebar_menu.py
@@ -156,7 +156,8 @@ class AddDialog(object):
 
 
 class OptionsDialog(object):
-    spin_ids = ["max_download_speed", "max_upload_speed", "max_upload_slots", "max_connections", "stop_ratio"]
+    spin_ids = ["max_download_speed", "max_upload_speed", "stop_ratio"]
+    spin_int_ids = ["max_upload_slots", "max_connections"]
     chk_ids = ["apply_max", "apply_queue", "stop_at_ratio", "apply_queue", "remove_at_ratio",
         "apply_move_completed", "move_completed", "is_auto_managed", "auto_add"]
 
@@ -197,7 +198,7 @@ class OptionsDialog(object):
     def load_options(self, options):
         log.debug(options.keys())
 
-        for id in self.spin_ids:
+        for id in self.spin_ids + self.spin_int_ids:
             self.glade.get_widget(id).set_value(options[id])
         for id in self.chk_ids:
             self.glade.get_widget(id).set_active(bool(options[id]))
@@ -221,6 +222,8 @@ class OptionsDialog(object):
 
         for id in self.spin_ids:
             options[id] = self.glade.get_widget(id).get_value()
+        for id in self.spin_int_ids:
+            options[id] = self.glade.get_widget(id).get_value_as_int()
         for id in self.chk_ids:
             options[id] = self.glade.get_widget(id).get_active()