diff --git a/binaries/data/mods/public/gui/session/selection_panels.js b/binaries/data/mods/public/gui/session/selection_panels.js
index bb772dab3d..dd3964d326 100644
--- a/binaries/data/mods/public/gui/session/selection_panels.js
+++ b/binaries/data/mods/public/gui/session/selection_panels.js
@@ -129,11 +129,12 @@ g_SelectionPanels.Command = {
 		for (const command in g_EntityCommands)
 		{
 			const info = getCommandInfo(command, unitEntStates);
-			if (info)
-			{
-				info.name = command;
-				commands.push(info);
-			}
+			if (!info)
+				continue;
+
+			info.name = command;
+			if (commands.push(info) >= this.getMaxNumberOfItems())
+				break;
 		}
 		return commands;
 	},