Merge pull request #786 from shuffle2/fix-toolbar-toggle Fix regression with toggling the toolbar from PR761
