26748 - fixed selected state

@tsanko @hippee-lee @kevinsproles - check me out...but don't forget to get the method pull request as well.