fix for toolbar selection state issue

fix for toolbar selection state issue when clicking a toolbar option/tool