Index: binaries/data/mods/public/gui/session/session.js
===================================================================
--- binaries/data/mods/public/gui/session/session.js
+++ binaries/data/mods/public/gui/session/session.js
@@ -1070,7 +1070,9 @@
 	let panelEntIndex = ent => g_PanelEntityOrder.findIndex(entClass =>
 		GetEntityState(ent).identity.classes.indexOf(entClass) != -1);
 
-	g_PanelEntities = g_PanelEntities.sort((panelEntA, panelEntB) => panelEntIndex(panelEntA.ent) - panelEntIndex(panelEntB.ent));
+	g_PanelEntities = g_PanelEntities.sort((panelEntA, panelEntB) =>
+		panelEntIndex(panelEntA.ent) - panelEntIndex(panelEntB.ent)
+	).slice(0, Engine.GetGUIObjectByName("panelEntityPanel").children.length);
 }
 
 function createPanelEntityTooltip(panelEntState, template)