diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 3f85059ce..35b8579d7 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -226,10 +226,7 @@ namespace MWSound
         // Don't play the same music track twice in a row
         if (filelist[i] == mLastPlayedMusic)
         {
-            if (i-1 == int(filelist.size()))
-                i = 0;
-            else
-                ++i;
+            i = (i+1) % filelist.size();
         }
 
         streamMusicFull(filelist[i]);