Flip from song to CD

When playing a song (on shuffle, or a playlist), it would be nice to be able to switch quickly (one click) to pull up the whole CD (or as much of it as you have) and continue playing that.