diff --git a/extensions/window/window_filter.lua b/extensions/window/window_filter.lua
index ae2e46d7e..cb6f8c802 100644
--- a/extensions/window/window_filter.lua
+++ b/extensions/window/window_filter.lua
@@ -995,7 +995,7 @@ function Window:emitEndChain()
   for wf in pairs(activeInstances) do
     if wf.pending[self] then
       emit(self,wf,windowfilter.windowRejected)
-      if wf.hasWindow then
+      if not next(wf.windows) then
         emit(self,wf,windowfilter.hasNoWindows) -- emit pseudo-event
         wf.hasWindow=nil
       end