Made window expansion work as intended.