Fix window cycling