Main Toolbar bug fix.