Add wrap-around functionality to select-next