Index: binaries/data/mods/public/gui/lobby/lobby.js
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby.js
+++ binaries/data/mods/public/gui/lobby/lobby.js
@@ -670,6 +670,7 @@
 
 	let gameList = Engine.GetGUIObjectByName("gamesBox");
 	let foundAsObserver = false;
+	let selected = -1;
 
 	for (let i = 0; i < g_GameList.length; ++i)
 		for (let player of stringifiedTeamListToPlayerData(g_GameList[i].players))
@@ -681,16 +682,17 @@
 			if (player.Team == "observer")
 			{
 				foundAsObserver = true;
-				gameList.selected = i;
+				selected = i;
 			}
 			else if (!player.Offline)
 			{
-				gameList.selected = i;
-				return;
+				selected = i;
+				break;
 			}
 			else if (!foundAsObserver)
-				gameList.selected = i;
+				selected = i;
 		}
+	gameList.selected = selected;
 }
 
 function onPlayerListSelection()