diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
index ce7e2c26a..b8ca9a28e 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java
@@ -31,7 +31,7 @@ public class SetGamePage extends BasePage
 
 		for (GameType type : _manager.getAvailableGames(getPlayer()))
 		{
-			int slot;
+			int slot = -1;
 
 			switch(type.getGameCategory())
 			{
@@ -47,13 +47,15 @@ public class SetGamePage extends BasePage
 					slot = championSlot;
 					championSlot += 9;
 					break;
-				default: // arcade
+				case ARCADE:
 					slot = arcadeSlot;
 					arcadeSlot++;
 					if (arcadeSlot % 9 == 3)
 						arcadeSlot += 6;
 			}
 
+			if (slot == -1) continue; // ignore EXTRA and TEAM_VARIANT games
+
 			addGameButton(slot, type);
 		}
 	}