diff --git a/dosbox_pure_osd.h b/dosbox_pure_osd.h
index 0a38af28..369f89b5 100644
--- a/dosbox_pure_osd.h
+++ b/dosbox_pure_osd.h
@@ -1801,7 +1801,7 @@ static void DBP_PureMenuProgram(Program** make)
 
 			DBP_FullscreenOSD = true;
 			DBP_PureMenuState* ms = new DBP_PureMenuState(m == M_BOOT);
-			bool runsoloexe = (ms->exe_count == 1 && ms->fs_rows <= 2 && !patchDrive::variants.Len());
+			bool runsoloexe = (ms->exe_count == 1 && ms->fs_rows <= (dbp_images.size() + 1) && !patchDrive::variants.Len());
 
 			#ifndef STATIC_LINKING
 			if (m == M_FINISH && dbp_menu_time >= 0 && dbp_menu_time < 99 && (runsoloexe || DBP_Run::autoboot.use) && (DBP_GetTicks() - dbp_lastmenuticks) >= 500)