Fix calls to right-click interactions too