diff --git a/core/src/zero1hd/rhythmbullet/audio/MusicController.java b/core/src/zero1hd/rhythmbullet/audio/MusicController.java
index 56af6c7..0a9a37e 100755
--- a/core/src/zero1hd/rhythmbullet/audio/MusicController.java
+++ b/core/src/zero1hd/rhythmbullet/audio/MusicController.java
@@ -193,6 +193,9 @@ public class MusicController extends Observable implements OnCompletionListener,
 	@Override
 	public void update(Observable o, Object arg) {
 		if (o == musicList) {
+			if (shuffle) {
+				shuffle(false);
+			}
 			loadMusic();
 		}
 	}
diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/audio/visualizer/PCMObtainer.java b/desktop/src/zero1hd/rhythmbullet/desktop/audio/visualizer/PCMObtainer.java
index 158e017..c7c7e29 100755
--- a/desktop/src/zero1hd/rhythmbullet/desktop/audio/visualizer/PCMObtainer.java
+++ b/desktop/src/zero1hd/rhythmbullet/desktop/audio/visualizer/PCMObtainer.java
@@ -55,7 +55,6 @@ public class PCMObtainer implements Observer, Disposable, PCMSystem {
 
 	private synchronized void calcPCMData() {
 		short chanVal;
-
 		for (int sid = 0; sid < PCM.length && sid < playingBuffer.remaining(); sid++) {
 			PCM[sid] = 0;
 			for (int channel = 0; channel < channelCount; channel++) {