--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfSelectionPage.java	Mon Dec 07 09:37:42 2009 -0600
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfSelectionPage.java	Mon Dec 07 13:45:40 2009 -0600
@@ -112,7 +112,7 @@
     	
 		setButtonLayoutData(browseButton);
 		
-		if (SBSv2Utils.enableSBSv2Support()) {
+		if (SBSv2Utils.enableSBSv1Support() && SBSv2Utils.enableSBSv2Support()) {
 	        builderComposite = new BuilderSelectionComposite(parent);
 	        builderComposite.createControls();
 		}
@@ -210,8 +210,11 @@
     public boolean useSBSv2Builder() {
     	if (builderComposite != null) {
         	return builderComposite.useSBSv2Builder();
+    	} else if (SBSv2Utils.enableSBSv1Support()) { 
+    		return false;
+    	} else {
+    		return SBSv2Utils.enableSBSv2Support();
     	}
-    	return false;
     }
 
     public void saveDialogSettings() {