6467 clear button tabindex

Completes @frequent's PR, taking into account @dylanb's comments.