diff --git a/TODO b/TODO
index a48670ca2..7e4aee739 100644
--- a/TODO
+++ b/TODO
@@ -62,4 +62,4 @@ rc8->final? changelog:
 - BUGFIX: Saving trackers file only when necessary
 - BUGFIX: Fixed possible segfault when unfiltering files in torrent addition dialog
 - BUGFIX: Fixed possible overflow in ETA calculation
-
+- BUGFIX: title bar is now reset when "Display speed in title" is disabled
diff --git a/src/GUI.cpp b/src/GUI.cpp
index 4cb5189c9..40aabaa90 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -764,7 +764,12 @@ void GUI::processDownloadedFiles(QString path, QString url) {
 void GUI::configureSession(bool deleteOptions) {
   qDebug("Configuring session");
   // General
-  displaySpeedInTitle = options->speedInTitleBar();
+  bool new_displaySpeedInTitle = options->speedInTitleBar();
+  if(!new_displaySpeedInTitle && new_displaySpeedInTitle != displaySpeedInTitle) {
+    // Reset title
+    setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
+  }
+  displaySpeedInTitle = new_displaySpeedInTitle;
   unsigned int new_refreshInterval = options->getRefreshInterval();
   if(refreshInterval != new_refreshInterval) {
     refreshInterval = new_refreshInterval;