diff --git a/Changelog b/Changelog
index 2b9444579..a067d3133 100644
--- a/Changelog
+++ b/Changelog
@@ -25,6 +25,7 @@
     - BUGFIX: Do not use an addition dialog for torrents from folder scanning
     - BUGFIX: Catch SIGTERM to exit cleanly (e.g. computer shutdown)
     - BUGFIX: Improved proxy support code
+    - BUGFIX: Fixed systray icon tooltip on Windows
 
 * Sun Nov 9 2008 - Christophe Dumez <chris@qbittorrent.org> - v1.2.1
     - BUGFIX: Fixed possible crash when deleting a torrent permanently
diff --git a/src/GUI.cpp b/src/GUI.cpp
index 53a308597..c0f27cb01 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -1422,6 +1422,12 @@ void GUI::checkConnectionStatus() {
   updateRatio();
   // update global informations
   if(systrayIntegration) {
+#ifdef Q_WS_WIN
+      // Windows does not support html here
+      QString html =tr("DL speed: %1 KiB/s", "e.g: Download speed: 10 KiB/s").arg(QString(QByteArray::number(BTSession->getPayloadDownloadRate()/1024., 'f', 1)));
+      html += "\n";
+      html += tr("UP speed: %1 KiB/s", "e.g: Upload speed: 10 KiB/s").arg(QString(QByteArray::number(BTSession->getPayloadUploadRate()/1024., 'f', 1)));
+#else
     QString html = "<div style='background-color: #678db2; color: #fff;height: 18px; font-weight: bold; margin-bottom: 5px;'>";
     html += tr("qBittorrent");
     html += "</div>";
@@ -1431,6 +1437,7 @@ void GUI::checkConnectionStatus() {
     html += "<div style='vertical-align: baseline; height: 18px;'>";
     html += "<img src=':/Icons/skin/seeding.png'/>&nbsp;"+tr("UP speed: %1 KiB/s", "e.g: Upload speed: 10 KiB/s").arg(QString(QByteArray::number(BTSession->getPayloadUploadRate()/1024., 'f', 1)));
     html += "</div>";
+#endif
     myTrayIcon->setToolTip(html); // tray icon
   }
   session_status sessionStatus = BTSession->getSessionStatus();