diff --git a/plugins/org.jboss.tools.forge.ui.ext/src/org/jboss/tools/forge/ui/ext/wizards/ForgeWizard.java b/plugins/org.jboss.tools.forge.ui.ext/src/org/jboss/tools/forge/ui/ext/wizards/ForgeWizard.java
index 909e87cfc..436cfb563 100644
--- a/plugins/org.jboss.tools.forge.ui.ext/src/org/jboss/tools/forge/ui/ext/wizards/ForgeWizard.java
+++ b/plugins/org.jboss.tools.forge.ui.ext/src/org/jboss/tools/forge/ui/ext/wizards/ForgeWizard.java
@@ -54,11 +54,7 @@ public void addPages() {
 
 	@Override
 	public boolean canFinish() {
-		if (isWizard()) {
-			return ((WizardCommandController) controller).canExecute();
-		} else {
-			return controller.isValid();
-		}
+		return controller.canExecute();
 	}
 
 	@Override