Fix color toggle for labels in edit view
Merge pull request #7536 from yuters/patch-5

Fix color toggle for labels in edit view