diff --git a/source/core/menu/razemenu.cpp b/source/core/menu/razemenu.cpp
index c2fef52bb..08b5c84be 100644
--- a/source/core/menu/razemenu.cpp
+++ b/source/core/menu/razemenu.cpp
@@ -370,6 +370,7 @@ static void BuildEpisodeMenu()
 {
 	// Build episode menu
 	int addedVolumes = 0;
+	bool textadded = false;
 	DMenuDescriptor** desc = MenuDescriptors.CheckKey(NAME_Episodemenu);
 	if (desc != nullptr && (*desc)->IsKindOf(RUNTIME_CLASS(DListMenuDescriptor)))
 	{
@@ -402,6 +403,7 @@ static void BuildEpisodeMenu()
 						gVolumeSubtitles[i], SmallFont, CR_GRAY, false, NAME_None, i);
 					y += ld->mLinespacing * 6 / 10;
 					ld->mItems.Push(it);
+					textadded = true;
 				}
 			}
 		}
@@ -419,7 +421,7 @@ static void BuildEpisodeMenu()
 #endif
 		if (addedVolumes == 1)
 		{
-			ld->mAutoselect = ld->mItems.Size()-1;
+			ld->mAutoselect = ld->mItems.Size() - (textadded ? 2 : 1);
 		}
 		if (popped) ld->mItems.Push(popped);
 	}