Window switching fix (0000206)