Fix selection style issues

[#76132754]