[OE-5150] click away bug fix