Fix bug in reorganization of toolbars after refreshing them