Fixed focus remaining on buttons after pressed
merge