Grenade pick up in EM matches

it gets kind of weird when u pick a rifle first in EM match and after that if u wanna shoot and u accidentally move over to a grenade and u pick up that. So instead of having a chance to shoot u switch to grenade automatically and the enemy runs away .

I think this thing should be fixed like secondary weapons , which gets stored under primary weapons as u pick them.