There are separate options for shuffling songs and categories (albums, artists, folders, genre, etc) and you can toggle them independently of each other.