Fixed bounds check on window select window add