[[ Bugfix 13909 ]] Fix a default button highlight issue for Yosemite
Merge pull request #1451 from runrevfraser/bugfix-13909

[[ Bugfix 13909 ]] Fix a default button highlight issue for Yosemite