diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
index 17e836db54c..a51e96f54a6 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSWizardHandler.java
@@ -140,7 +140,7 @@ public class MBSWizardHandler extends CWizardHandler {
 					break;
 			
 				projectTypeId = path[0];
-				if(path.length > 1){
+				if(path.length > 1 && (!path[0].equals(ManagedBuildWizard.OTHERS_LABEL))){
 					templateId = path[path.length - 1]; 
 					Template templates[] = TemplateEngineUI.getDefault().getTemplates(projectTypeId);
 					if(templates.length == 0)
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
index 429f2c2c6ac..ffc77acf57f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/ManagedBuildWizard.java
@@ -34,7 +34,7 @@ import org.eclipse.swt.graphics.Image;
  */
 public class ManagedBuildWizard extends AbstractCWizard {
 	private static final Image IMG = CPluginImages.get(CPluginImages.IMG_OBJS_CONTAINER);
-	private static final String OTHERS_LABEL = Messages.getString("CNewWizard.0");  //$NON-NLS-1$
+	public static final String OTHERS_LABEL = Messages.getString("CNewWizard.0");  //$NON-NLS-1$
 	/**
 	 * Creates and returns an array of items to be displayed 
 	 */
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java
index c574f407e9a..8e8022dc30b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/CDTMainWizardPage.java
@@ -536,27 +536,22 @@ import org.eclipse.cdt.internal.ui.CPluginImages;
 		}
 
 		private void switchTo(CWizardHandler h, EntryDescriptor ed) {
-
-			if (h == null) h = ed.getHandler();
-
+			if (h == null) 
+				h = ed.getHandler();
 			try {
-
-			if (h != null && ed != null) h.initialize(ed);
-
-			} catch (CoreException e) { h = null; }
-
-			if (h_selected != null) h_selected.handleUnSelection();
-
+				if (h != null && ed != null) 
+					h.initialize(ed);
+			} catch (CoreException e) { 
+				h = null; 
+			}
+			if (h_selected != null) 
+				h_selected.handleUnSelection();
 			h_selected = h;
-
-			if (h == null) return;
-
+			if (h == null) 
+				return;
 			right_label.setText(h_selected.getHeader());
-
 			h_selected.handleSelection();
-
 			h_selected.setSupportedOnly(show_sup.getSelection());
-
 		}