diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 5c56a74da..151f9b598 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -306,8 +306,11 @@ MainWindow::MainWindow(QWidget *parent)
             activateWindow();
             raise();
         }
-        else {
-            create();
+        else if (pref->startMinimized()) {
+            if (pref->minimizeToTray())
+                create();
+            else
+                showMinimized();
         }
     }
     else {