Made angrilov's fix to menu window Rect management.