I downloaded the v2.0.99.676 patch, and it seems to have fixed the problem I was having with the henchman merchant becoming unselectable.

I don't know if this was intentional since it's not mentioned in the patch notes, but thanks anyway Larian!