diff --git a/src/screen.c b/src/screen.c
index 142616d..28dbad7 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2244,7 +2244,8 @@ findTopLevelWindowAtScreen (CompScreen *s,
 	    for (w = s->windows; w; w = w->next)
 		if (w->frame == id)
 		    return w;
-	}
+	} else 
+	    return w;
 
 	return NULL;
     }