diff --git a/quickshell/Services/CompositorService.qml b/quickshell/Services/CompositorService.qml
index 617fcfbe..a9f43e23 100644
--- a/quickshell/Services/CompositorService.qml
+++ b/quickshell/Services/CompositorService.qml
@@ -417,7 +417,7 @@ Singleton {
 
         if (isNiri) {
             const active = ToplevelManager.activeToplevel;
-            if (active?.fullscreen && active?.activated && NiriService.currentOutput === screenName)
+            if (active?.fullscreen && active?.activated && _toplevelOnScreen(active, screenName))
                 return true;
 
             const filtered = filterCurrentWorkspace(sortedToplevels, screenName);