I've pulled the stunt at least 20 times. Now I only forget to check about one time out of a few hundred.
The correct solution from the UI point of view is to require an overt selection by the player. Failing to make the selection would result in a whiff.
It would be a trivial modification.