diff --git a/code/ryzom/client/src/interface_v3/music_player.cpp b/code/ryzom/client/src/interface_v3/music_player.cpp
index edef6a784..029decf1c 100644
--- a/code/ryzom/client/src/interface_v3/music_player.cpp
+++ b/code/ryzom/client/src/interface_v3/music_player.cpp
@@ -108,8 +108,11 @@ void CMusicPlayer::previous ()
 	if (!_Songs.empty())
 	{
 		// Point the previous song
-		_CurrentSong--;
-		_CurrentSong%=_Songs.size();
+		if (_CurrentSong == 0)
+			_CurrentSong = _Songs.size()-1;
+		else
+			_CurrentSong--;
+
 		play ();
 	}
 }