[Bugfix beta] fix click helper focus change issue