Mercenary walking after using shield

Whenever i use my shield as a mercenary and switch back to my crossbow, the crossbow is pointing up and my character start to walk. I can't switch ammunition skills and the only way to "break/fix" the bug is to roll. Anyone else having this problem or maybe a fix?

UPDATE: It's only a problem in the hideout. Once you're in a map it's not happening