diff --git a/Changelog b/Changelog
index 15f274b44..7c5b7be50 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 * Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.5.4
   - BUGFIX: Updated man page
   - BUGFIX: Fixed possible crash with torrents containing unicode characters
+  - BUGFIX: Fixed problem when disabling systray integration and starting minimized
 
 * Wed Sep 30 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.5.3
   - BUGFIX: Fix a possible crash when pausing then deleting a torrent quickly
diff --git a/src/GUI.cpp b/src/GUI.cpp
index 7bc68ac43..d48a7d20a 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -249,8 +249,9 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
     QMainWindow::statusBar()->addPermanentWidget(upSpeedLbl);
     QMainWindow::statusBar()->addPermanentWidget(statusSep4);
     QMainWindow::statusBar()->addPermanentWidget(ratioLbl);
-    if(!settings.value(QString::fromUtf8("Preferences/General/StartMinimized"), false).toBool()) {
-      show();
+    show();
+    if(settings.value(QString::fromUtf8("Preferences/General/StartMinimized"), false).toBool()) {
+      this->setWindowState(Qt::WindowMinimized);
     }
     scrapeTimer = new QTimer(this);
     connect(scrapeTimer, SIGNAL(timeout()), this, SLOT(scrapeTrackers()));