Fix for the UI issue for the tooltip

Reviewer: Cy Casada

Issue: GCP-9570