Changed mouse interaction to use SwingUtilitiesIsRightMouseButton as the mask approach didn't seem to work properly for mouseclicked events.