diff --git a/src/compositor.cpp b/src/compositor.cpp
index 16c25b8dec..d822a75b41 100644
--- a/src/compositor.cpp
+++ b/src/compositor.cpp
@@ -162,7 +162,7 @@ void Compositor::composite(RenderLoop *renderLoop)
         prePaintPass(superLayer, &surfaceDamage);
 
         Window *const activeWindow = workspace()->activeWindow();
-        SurfaceItem *const activeFullscreenItem = activeWindow && activeWindow->isFullScreen() ? activeWindow->surfaceItem() : nullptr;
+        SurfaceItem *const activeFullscreenItem = activeWindow && activeWindow->isFullScreen() && activeWindow->isOnOutput(output) ? activeWindow->surfaceItem() : nullptr;
         frame->setContentType(activeWindow && activeFullscreenItem ? activeFullscreenItem->contentType() : ContentType::None);
 
         const bool wantsAdaptiveSync = activeWindow && activeWindow->isOnOutput(output) && activeWindow->wantsAdaptiveSync();