diff --git a/TeamManager/scripting/TeamManager.sp b/TeamManager/scripting/TeamManager.sp
index ed4031c..f5ed8ce 100644
--- a/TeamManager/scripting/TeamManager.sp
+++ b/TeamManager/scripting/TeamManager.sp
@@ -94,6 +94,15 @@ public Action OnJoinTeamCommand(int client, const char[] command, int argc)
 	if(client < 1 || client >= MaxClients || !IsClientInGame(client))
 		return Plugin_Continue;
 
+	if(StrEqual(command, "joingame", false))
+	{
+		if(GetClientTeam(client) != CS_TEAM_NONE)
+			return Plugin_Continue;
+		
+		ShowVGUIPanel(client, "team");
+		return Plugin_Handled;
+	}
+
 	char sArg[8];
 	GetCmdArg(1, sArg, sizeof(sArg));