[Tabs] Fix tabs activating incorrectly on non-primary button clicks

[Tabs] Fix tabs activating incorrectly on non-primary button clicks #5917