Fix for #1609
Merge pull request #1612 from juancarlospaco/fix/toolbar

Fix for #1609