Improve overlay window handling

3 jobs for enhance-overlay in 4 minutes and 21 seconds (queued for 2 seconds)