diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9eb3d1bdb..72996b5e5 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -701,9 +701,10 @@ void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e) {
         if(!unlockUI())
           return;
       }
+      // Make sure the window is not minimized
+      setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
+      // Then show it
       show();
-      raise();
-      activateWindow();
     }else{
       hide();
     }