Skills Set to Weapon set isnt working with controller

I typically play on controller since I switch between pc and steam deck often. An issue that arises is that whenever I update skills, I have to switch to KB and Mouse to indicate which weapon set to use it with. Is there a way this option could be added in for controller players? It would be very helpful. An option to allow mouse use in menus when using controllers would also be amazing. Loving the game so far though!