Change the tab to use the tab drop

Reviewer: Cy Casada (post commit)

Issue:     GCP-9636