diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 3a5fa0b6..43616868 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -260,7 +260,7 @@ void CHyprRenderer::renderWorkspaceWindows(CMonitor* pMonitor, CWorkspace* pWork
             continue;
 
         // render active window after all others of this pass
-        if (w.get() == g_pCompositor->m_pLastWindow) {
+        if (w.get() == g_pCompositor->m_pLastWindow && w->m_iWorkspaceID == pWorkspace->m_iID) {
             lastWindow = w.get();
             continue;
         }