Improvements to window restoration done while fixing #86329