diff --git a/Changelog b/Changelog
index a53d3b434..0c1c80f99 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.2.8
     - BUGFIX: ETA for finished torrent is now 0 instead of Infinite (closes #583704)
+    - BUGFIX: Fix sorting of ETA column when having infinite values (closes #583347)
     - BUGFIX: Fix unicode issue in start seeding after torrent creation code
     - COSMETIC: Fix torrent properties layout
 
diff --git a/src/misc.cpp b/src/misc.cpp
index 73b7819d6..a41c02d70 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -459,7 +459,7 @@ QString misc::expandPath(QString path) {
 // Take a number of seconds and return an user-friendly
 // time duration like "1d 2h 10m".
 QString misc::userFriendlyDuration(qlonglong seconds) {
-  if(seconds < 0) {
+  if(seconds < 0 || seconds >= MAX_ETA) {
     return QString::fromUtf8("∞");
   }
   if(seconds == 0) {
diff --git a/src/misc.h b/src/misc.h
index 0a007b57e..d81d8b80f 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -40,6 +40,8 @@
 #include <QPoint>
 
 #include <libtorrent/torrent_info.hpp>
+const qlonglong MAX_ETA = 8640000;
+
 using namespace libtorrent;
 
 /*  Miscellaneaous functions that can be useful */
diff --git a/src/transferlistwidget.cpp b/src/transferlistwidget.cpp
index ba972fd43..18c8bd7fc 100644
--- a/src/transferlistwidget.cpp
+++ b/src/transferlistwidget.cpp
@@ -167,7 +167,7 @@ void TransferListWidget::addTorrent(QTorrentHandle& h) {
     listModel->insertRow(row);
     listModel->setData(listModel->index(row, TR_NAME), QVariant(h.name()));
     listModel->setData(listModel->index(row, TR_SIZE), QVariant((qlonglong)h.actual_size()));
-    listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)-1));
+    listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)MAX_ETA));
     listModel->setData(listModel->index(row, TR_SEEDS), QVariant((double)0.0));
     listModel->setData(listModel->index(row, TR_PEERS), QVariant((double)0.0));
     listModel->setData(listModel->index(row, TR_ADD_DATE), QVariant(TorrentPersistentData::getAddedDate(h.hash())));
@@ -252,7 +252,7 @@ void TransferListWidget::pauseTorrent(int row, bool refresh_list) {
   } else {
     listModel->setData(listModel->index(row, TR_STATUS), STATE_PAUSED_DL);
     listModel->setData(listModel->index(row, TR_NAME), QIcon(QString::fromUtf8(":/Icons/skin/pausedDL.png")), Qt::DecorationRole);
-    listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)-1));
+    listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)MAX_ETA));
   }
   listModel->setData(listModel->index(row, TR_SEEDS), QVariant(0.0));
   listModel->setData(listModel->index(row, TR_PEERS), QVariant(0.0));
@@ -351,7 +351,7 @@ int TransferListWidget::updateTorrent(int row) {
           }
           listModel->setData(listModel->index(row, TR_STATUS), s);
         }else {
-          listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)-1));
+          listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)MAX_ETA));
           if(h.is_seed()) {
             s = STATE_QUEUED_UP;            
             listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/queuedUP.png"))), Qt::DecorationRole);
@@ -396,7 +396,7 @@ int TransferListWidget::updateTorrent(int row) {
       }
       listModel->setData(listModel->index(row, TR_PROGRESS), QVariant((double)h.progress()));
       if(!isColumnHidden(TR_ETA))
-        listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)-1));
+        listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)MAX_ETA));
       setRowColor(row, QString::fromUtf8("grey"));
       break;
     case torrent_status::downloading:
@@ -410,7 +410,7 @@ int TransferListWidget::updateTorrent(int row) {
       }else{
         listModel->setData(listModel->index(row, TR_NAME), QVariant(QIcon(QString::fromUtf8(":/Icons/skin/stalledDL.png"))), Qt::DecorationRole);
         if(!isColumnHidden(TR_ETA))
-          listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)-1));
+          listModel->setData(listModel->index(row, TR_ETA), QVariant((qlonglong)MAX_ETA));
         s = STATE_STALLED_DL;
         setRowColor(row, QApplication::palette().color(QPalette::WindowText));
       }