diff --git a/src/menus/transient/level-select.c b/src/menus/transient/level-select.c
index ec0c3034b..54ea2c078 100644
--- a/src/menus/transient/level-select.c
+++ b/src/menus/transient/level-select.c
@@ -586,10 +586,14 @@ boolean M_LevelListFromGametype(INT16 gt)
 			possiblecursor++;
 		}
 
-		if (test != NEXTMAP_INVALID)
+		if (test < nummapheaders)
+		{
 			levellist.cursor = possiblecursor;
+			invalidatedcursor = false;
+		}
 	}
-	else if (invalidatedcursor)
+
+	if (invalidatedcursor)
 	{
 		levellist.cursor = 0;
 	}