re #895 - Fixed color issue when button is focused