diff --git a/Ninjacrab.PersistentWindows.Solution/Common/PersistentWindowProcessor.cs b/Ninjacrab.PersistentWindows.Solution/Common/PersistentWindowProcessor.cs
index e2d1eae..0c2a277 100644
--- a/Ninjacrab.PersistentWindows.Solution/Common/PersistentWindowProcessor.cs
+++ b/Ninjacrab.PersistentWindows.Solution/Common/PersistentWindowProcessor.cs
@@ -1806,9 +1806,10 @@ namespace PersistentWindows.Common
                 if (fullScreenGamingWindows.Contains(hwnd))
                 {
                     fullScreenGamingWindows.Remove(hwnd);
-                    fullScreenGamingWindow = IntPtr.Zero;
                     exitFullScreenGaming = true;
                 }
+                if (hwnd == fullScreenGamingWindow)
+                    fullScreenGamingWindow = IntPtr.Zero;
                 dualPosSwitchWindows.Remove(hwnd);
 
                 bool found_history = false;