Kliff, his bow, and the need to unsheath

Something I’m noticing is that if I take down an enemy using the bow, Kliff will often then automatically unsheath his sword, even in situations where I’d prefer him continue using the bow.

Am I doing something wrong? Pressing the wrong buttons?

Or is this something that could be tweaked by the fine folks over at Pearl Abyss?