[BUGFIX][FOLLOWUP] Make ClickMenu calls use new API