#2 fix Toolbar listener