diff --git a/plugins/org.yakindu.sct.generator.genmodel.ui/src/org/yakindu/sct/generator/genmodel/ui/wizard/SGenWizardPage2.java b/plugins/org.yakindu.sct.generator.genmodel.ui/src/org/yakindu/sct/generator/genmodel/ui/wizard/SGenWizardPage2.java
index cb8cc3733d..4e4153b835 100644
--- a/plugins/org.yakindu.sct.generator.genmodel.ui/src/org/yakindu/sct/generator/genmodel/ui/wizard/SGenWizardPage2.java
+++ b/plugins/org.yakindu.sct.generator.genmodel.ui/src/org/yakindu/sct/generator/genmodel/ui/wizard/SGenWizardPage2.java
@@ -99,9 +99,14 @@ public void createControl(Composite parent) {
 		container.setLayout(new GridLayout(1, false));
 		createGeneratorCombo(container);
 		createObjectTree(container);
-		refreshInput();
 	}
 
+	@Override
+	public void setVisible(boolean visible) {
+		super.setVisible(visible);
+		refreshInput();
+	}
+	
 	private void createObjectTree(Composite container) {
 		lblNewLabel = new Label(container, SWT.NONE);
 		lblNewLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1));
diff --git a/plugins/org.yakindu.sct.ui/src/org/yakindu/sct/ui/wizards/WorkspaceTreeContentProvider.java b/plugins/org.yakindu.sct.ui/src/org/yakindu/sct/ui/wizards/WorkspaceTreeContentProvider.java
index 197e6a37f4..f960081777 100644
--- a/plugins/org.yakindu.sct.ui/src/org/yakindu/sct/ui/wizards/WorkspaceTreeContentProvider.java
+++ b/plugins/org.yakindu.sct.ui/src/org/yakindu/sct/ui/wizards/WorkspaceTreeContentProvider.java
@@ -10,7 +10,7 @@
  */
 package org.yakindu.sct.ui.wizards;
 
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.eclipse.core.resources.IContainer;
@@ -85,7 +85,7 @@ else if (member instanceof IFile && ((IFile) member).getFileExtension().equals(f
 	}
 
 	public Object[] filterForContent(Object[] inputElements) throws CoreException {
-		final Set<Object> result = new HashSet<Object>();
+		final Set<Object> result = new LinkedHashSet<Object>();
 		for (final Object obj : inputElements) {
 			((IResource) obj).accept(new IResourceVisitor() {
 				public boolean visit(IResource resource) throws CoreException {