Gemcutting QoL (weapon different from your "class" weapon)

Right now I play as a Warrior with Crossbow, and my issue is that whenever I want to use Uncut skill gem, I'm being shown a page with Mace abilities and I need to manually change it to Crossbow section. It's annoying especially in the campaign when I change skills a lot.

My idea is that the game could check what weapon type you're currently wearing and open the according section when clicking on uncut skill gem.