Fix NPE when creating set from top-level menu