diff --git a/source/Playnite/Windows/WindowFactory.cs b/source/Playnite/Windows/WindowFactory.cs
index 80b7a6cad..65c1de47e 100644
--- a/source/Playnite/Windows/WindowFactory.cs
+++ b/source/Playnite/Windows/WindowFactory.cs
@@ -198,7 +198,7 @@ public static void RestoreWindow(this Window window)
                 // not render properly for some reason (will display just black).
                 // BUT we can't call it always otherwise it will bug out restore if atl-tabbing was
                 // used in the past for switching windows, see next comment...
-                if (window.WindowState == WindowState.Minimized)
+                if (window.WindowState == WindowState.Minimized || window.Visibility != Visibility.Visible)
                 {
                     window.Show();
                 }