Merge pull request #14138 from danielnixon/master

Fix inaccessible buttons.