Fix regression with toggling the toolbar from PR761