Fixed toolbar targeting issue