Fix buggy delete button focus avoidance

This did not previously work in all cases; if we explicitly check for
the activation of the delete button, that should do it.