Refix selector deselection prevention

I think I was just being cautious about signal recursion, but this seems to work and delaying the
toggle's reselection causes worse problems.
Nix todo