Until now the shuffle mode only worked by pressing next.
This fixes will make sure that the shuffle mode is respected on both cases.
Closes #753 (closed)