diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/CreateModuleOrTargetPopup.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/CreateModuleOrTargetPopup.kt
index 4ec1fee2f3f..cd923ffe19e 100644
--- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/CreateModuleOrTargetPopup.kt
+++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/CreateModuleOrTargetPopup.kt
@@ -72,6 +72,11 @@ class CreateModuleOrTargetPopup private constructor(
             else -> null
         }
 
+        override fun hasSubstep(selectedValue: DisplayableSettingItem?): Boolean =
+            selectedValue is TargetConfiguratorGroupWithSubItems
+
+        override fun isAutoSelectionEnabled(): Boolean = true
+
         override fun getTextFor(value: DisplayableSettingItem): String = value.fullTextHtml
 
         override fun onChosen(selectedValue: DisplayableSettingItem?, finalChoice: Boolean): PopupStep<*>? {