Use the correct window in the other steps that use one