fixes one of the accessibility issues reported in #25896.
mentioned in commit 23c20a48
mentioned in commit f18819c4