Fix bug where irrelevant menu items are enabled in token fields