diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp
index 528f0dbb..5b48ce75 100644
--- a/cockatrice/src/window_main.cpp
+++ b/cockatrice/src/window_main.cpp
@@ -447,7 +447,7 @@ void MainWindow::createTrayIcon() {
 
 void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason) {
     if (reason == QSystemTrayIcon::DoubleClick) {
-        if (windowState() != Qt::WindowMinimized)
+        if (windowState() != Qt::WindowMinimized && windowState() != Qt::WindowMinimized + Qt::WindowMaximized)
             showMinimized();
         else {
             showNormal();