Martin Yde - #8331, Added class for chosen