diff --git a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt
index 1b158bb286a..dde90958b19 100644
--- a/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt
+++ b/idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/firstStep/ProjectTemplateSettingComponent.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.kotlin.tools.projectWizard.wizard.ui.firstStep
 
+import com.intellij.ui.JBColor
 import com.intellij.ui.ScrollPaneFactory
 import com.intellij.ui.SeparatorWithText
 import com.intellij.util.ui.JBUI
@@ -15,6 +16,7 @@ import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.*
 import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.setting.SettingComponent
 import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.setting.ValidationIndicator
 import java.awt.Dimension
+import javax.swing.BorderFactory
 import javax.swing.Icon
 import javax.swing.JComponent
 
@@ -43,12 +45,10 @@ class ProjectTemplateSettingComponent(
         onValueSelected = { value = it }
     )
 
-    private val scrollPane = ScrollPaneFactory.createScrollPane(list).apply {
-        preferredSize = Dimension(minimumSize.width, HEIGHT)
-    }
+    private val borderedPanel = list.addBorder(BorderFactory.createLineBorder(JBColor.border()))
 
     override val component: JComponent = borderPanel {
-        addToCenter(borderPanel { addToCenter(scrollPane) }.addBorder(JBUI.Borders.empty(0,/*left*/ 3, 0, /*right*/ 3)))
+        addToCenter(borderPanel { addToCenter(list) }.addBorder(JBUI.Borders.empty(0,/*left*/ 3, 0, /*right*/ 3)))
         addToBottom(templateDescriptionComponent.component.addBorder(JBUI.Borders.empty(/*top*/8,/*left*/ 3, 0, 0)))
     }
 
@@ -74,10 +74,6 @@ class ProjectTemplateSettingComponent(
             value = setting.type.values.firstOrNull()
         }
     }
-
-    companion object {
-        private const val HEIGHT = 310
-    }
 }
 
 private val ProjectTemplate.icon: Icon