applied fix for #1172 - Clear button overlaps text