diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp
index 31fe0fd3b5..033ad599ba 100644
--- a/src/menu/menudef.cpp
+++ b/src/menu/menudef.cpp
@@ -1327,7 +1327,11 @@ void M_StartupSkillMenu(FGameStartup *gs)
 			}
 			if (AllEpisodes[gs->Episode].mNoSkill || AllSkills.Size() == 1)
 			{
-				ld->mAutoselect = MIN(2u, AllEpisodes.Size()-1);
+				ld->mAutoselect = firstitem + MIN(2u, AllEpisodes.Size()-1);
+			}
+			else
+			{
+				ld->mAutoselect = -1;
 			}
 			success = true;
 		}