Improved add window reset