diff --git a/ChangeLog b/ChangeLog
index 8c35112e4..31b8ee216 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 
 ==== GtkUI ====
 	* replace & with & in the details tab to ensure there are no markup errors
+	* Consider 0 unlimited when displaying limits in the statusbar
 
 ==== Web ====
 	* Fix #1046 changing auto managed via the details tab
@@ -37,7 +38,7 @@
 
 ==== Console ====
 	* Fix exception when using the 'halt' command
-	
+
 ==== Misc ====
 	* Add man pages for deluge-console, deluge-gtk and deluge-web
 
diff --git a/deluge/ui/gtkui/statusbar.py b/deluge/ui/gtkui/statusbar.py
index a94775a55..3c5914fb2 100644
--- a/deluge/ui/gtkui/statusbar.py
+++ b/deluge/ui/gtkui/statusbar.py
@@ -342,7 +342,7 @@ class StatusBar(component.Component):
 
     def update_download_label(self):
         # Set the download speed label
-        if self.max_download_speed < 0:
+        if self.max_download_speed <= 0:
             label_string = "%s/s" % self.download_rate
         else:
             label_string = "%s/s (%s %s)" % (
@@ -352,7 +352,7 @@ class StatusBar(component.Component):
 
     def update_upload_label(self):
         # Set the upload speed label
-        if self.max_upload_speed < 0:
+        if self.max_upload_speed <= 0:
             label_string = "%s/s" % self.upload_rate
         else:
             label_string = "%s/s (%s %s)" % (