diff --git a/TODO b/TODO
index da99db305..1f781cadb 100644
--- a/TODO
+++ b/TODO
@@ -57,4 +57,5 @@
 
 rc5->rc6 changelog:
 - BUGFIX: configure looks for libraries in lib64 folders too
-- BUGFIX: configure doesn't require paths with a terminal "/" anymore
\ No newline at end of file
+- BUGFIX: configure doesn't require paths with a terminal "/" anymore
+- BUGFIX: Fixed minimize to tray feature
\ No newline at end of file
diff --git a/src/GUI.cpp b/src/GUI.cpp
index e8de458a1..934096980 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -519,7 +519,7 @@ void GUI::on_actionCreate_torrent_triggered() {
 // Called when we minimize the program
 void GUI::hideEvent(QHideEvent *e) {
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-  if(systrayIntegration && settings.value(QString::fromUtf8("Preferences/General/MinimizeToTray"), false).toBool() && !e->spontaneous()) {
+  if(systrayIntegration && settings.value(QString::fromUtf8("Preferences/General/MinimizeToTray"), false).toBool()) {
     // Hide window
     hide();
   }