Fix tracking of border buttons.