diff --git a/ChangeLog b/ChangeLog
index 45c599e79..665294d2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
 	* Fix setting torrent options when adding
 	* Fix setting file priorities when adding
 	* HTML escape the field values on the details tab
+	* Fix #215, make infinite eta values display in the correct order
 
 === Deluge 1.2.0_rc2 (25 October 2009) ===
 ==== GtkUI ====
diff --git a/deluge/ui/web/js/Deluge.Torrents.js b/deluge/ui/web/js/Deluge.Torrents.js
index a434cd3a0..781352cc9 100644
--- a/deluge/ui/web/js/Deluge.Torrents.js
+++ b/deluge/ui/web/js/Deluge.Torrents.js
@@ -71,6 +71,10 @@ Copyright:
     function trackerRenderer(value, p, r) {
         return String.format('<div style="background: url(/tracker/{0}) no-repeat; padding-left: 20px;">{0}</div>', value);
     }
+    
+    function etaSorter(eta) {
+        return eta * -1;
+    }
 
     /**
      * Ext.deluge.TorrentGrid Class
@@ -100,7 +104,7 @@ Copyright:
                         {name: 'total_peers', type: 'int'},
                         {name: 'downspeed', type: 'int'},
                         {name: 'upspeed', type: 'int'},
-                        {name: 'eta', type: 'int'},
+                        {name: 'eta', type: 'int', sortType: etaSorter},
                         {name: 'ratio', type: 'float'},
                         {name: 'avail', type: 'float'},
                         {name: 'added', type: 'int'},