diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index 51d1311c9..729f99464 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -1991,14 +1991,7 @@ static void M_DrawCupTitle(INT16 y, cupheader_t *cup)
 void M_DrawCupSelect(void)
 {
 	UINT8 i, j;
-	cupheader_t *cup = kartcupheaders;
-
-	while (cup)
-	{
-		if (cup->id == CUPMENU_CURSORID)
-			break;
-		cup = cup->next;
-	}
+	cupheader_t *cup = cupgrid.builtgrid[CUPMENU_CURSORID];
 
 	for (i = 0; i < CUPMENU_COLUMNS; i++)
 	{