Follow up from recent UI refactors. Part of: #117604 Pull Request: https://projects.blender.org/blender/blender/pulls/143324