A possible workable version of Howards pull request

because else you won't be able to unselect in any way. Please add it back.