diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index fbbfd7e77d7..0e0c75a131f 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -1389,6 +1389,9 @@ void CCompositor::changeWindowZOrder(PHLWINDOW pWindow, bool top) {
     if (!validMapped(pWindow))
         return;
 
+    if (top)
+        pWindow->m_bCreatedOverFullscreen = true;
+
     if (pWindow == (top ? m_vWindows.back() : m_vWindows.front()))
         return;
 
@@ -1413,9 +1416,6 @@ void CCompositor::changeWindowZOrder(PHLWINDOW pWindow, bool top) {
             g_pHyprRenderer->damageMonitor(pw->m_pMonitor.lock());
     };
 
-    if (top)
-        pWindow->m_bCreatedOverFullscreen = true;
-
     if (!pWindow->m_bIsX11)
         moveToZ(pWindow, top);
     else {