UI behavior fix on GCP-4746
UI behavior fix on GCP-4746