[canvas] Improve (Closes #7145)