Crossbow weapon swap - genades

Grenades don't recovery to max number of grenades after weapon swap.
Weapon set 1 - Explosive Shot
Weapon set 2 - Explosive Grenade (max 4 grenades -> 3+1 from skill tree)

I need to be on weapon set 2 to get max grenades.
Is this intended ?