Fix toggling to non-shuffle while in shuffle