Index: src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java =================================================================== --- src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java (revision 31724) +++ src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java (working copy) @@ -63,6 +63,7 @@ super.doPopulate(); this.genericGeneratorExpansionStateHolder .setValue(Boolean.valueOf(getSubject() != null && getSubject().genericGeneratorsSize() > 0)); + this.generatorHolder.setValue(getSubject() != null && getSubject().genericGeneratorsSize() > 0 ? getSubject().genericGenerators().next() : null); } @Override