Mohammed Sadiq authored Apr 15, 2021 and Mohammed Sadiq committed Apr 16, 2021

We were using hacks to mark the item as selected, which resulted
in the selected state to be broken in some cases.  Avoid the hacks
and let the default signal callback do its work.