#817 Bugfix for toolbar