[CHG] focus behaviour change