Improved handling for split windows