Window closing improvements