diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp
index 04c78806c..8616c8a27 100644
--- a/src/base/bittorrent/torrenthandle.cpp
+++ b/src/base/bittorrent/torrenthandle.cpp
@@ -27,6 +27,7 @@
  * exception statement from your version.
  */
 
+#include <algorithm>
 #include <type_traits>
 
 #include <QDebug>
@@ -1108,10 +1109,9 @@ int TorrentHandle::timeSinceDownload() const
 
 int TorrentHandle::timeSinceActivity() const
 {
-    if (m_nativeStatus.time_since_upload < m_nativeStatus.time_since_download)
-        return m_nativeStatus.time_since_upload;
-    else
-        return m_nativeStatus.time_since_download;
+    return ((m_nativeStatus.time_since_upload < 0) != (m_nativeStatus.time_since_download < 0))
+        ? std::max(m_nativeStatus.time_since_upload, m_nativeStatus.time_since_download)
+        : std::min(m_nativeStatus.time_since_upload, m_nativeStatus.time_since_download);
 }
 
 int TorrentHandle::downloadLimit() const
diff --git a/src/gui/transferlistdelegate.cpp b/src/gui/transferlistdelegate.cpp
index 6187cc245..5275380fc 100644
--- a/src/gui/transferlistdelegate.cpp
+++ b/src/gui/transferlistdelegate.cpp
@@ -181,14 +181,14 @@ void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem
         if (hideValues && ((elapsed < 0) || (elapsed >= MAX_ETA)))
             break;
 
-        QString elapsedString;
+        // Show '< 1m ago' when elapsed time is 0
         if (elapsed == 0)
-            // Show '< 1m ago' when elapsed time is 0
             elapsed = 1;
-        else if (elapsed < 0)
-            elapsedString = Utils::Misc::userFriendlyDuration(elapsed);
-        else
-            elapsedString = tr("%1 ago", "e.g.: 1h 20m ago").arg(Utils::Misc::userFriendlyDuration(elapsed));
+
+        QString elapsedString = (elapsed >= 0)
+            ? tr("%1 ago", "e.g.: 1h 20m ago").arg(Utils::Misc::userFriendlyDuration(elapsed))
+            : Utils::Misc::userFriendlyDuration(elapsed);
+
         opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
         QItemDelegate::drawDisplay(painter, opt, option.rect, elapsedString);
         break;