diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6f9aad239..6779d034e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -255,9 +255,13 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
   readSettings();
 
   if(!ui_locked) {
-    if(pref.startMinimized() && systrayIcon)
-      showMinimized();
-    else {
+    if(pref.startMinimized() && systrayIcon) {
+      show();
+      minimizeWindow();
+      // XXX: Using showMinimized() makes it impossible to restore
+      // the window if "Minimize to systray" is enabled.
+      //showMinimized();
+    } else {
       show();
       activateWindow();
       raise();