diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 68221c981..0a06a0a73 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -418,7 +418,23 @@ MainWindow::MainWindow(IGUIApplication *app, const WindowState initialState, con
         if (!isVisible())
             activate();
 #else
-        toggleVisibility();
+        if (isActiveWindow())
+        {
+            hide();
+        }
+        else
+        {
+            if (m_uiLocked && !unlockUI())  // Ask for UI lock password
+                return;
+
+            // Make sure the window is not minimized
+            setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
+
+            // Then show it
+            show();
+            raise();
+            activateWindow();
+        }
 #endif
     });