Order up next watchlist by rank

I like to see my watchlisted shows in my next up, so I have “Include Watchlisted” enabled, which works great. However, I also keep my watchlist sorted by rank which helps me prioritise what to watch next. Is it possible if we could have a setting that orders the watchlist items in the up next by rank?