diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchTopPanel.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchTopPanel.kt
index 3d92acc86f6..2b543bc318c 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchTopPanel.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ui/ScratchTopPanel.kt
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.idea.scratch.ui
 
 
 import com.intellij.application.options.ModulesComboBox
-import com.intellij.execution.ui.ConfigurationModuleSelector
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionPlaces
@@ -72,6 +71,14 @@ class ScratchTopPanel private constructor(val scratchFile: ScratchFile) : JPanel
         add(JLabel("Use classpath of module"))
         add(moduleChooser)
 
+        isMakeBeforeRunCheckbox = JCheckBox("Make before Run")
+        add(isMakeBeforeRunCheckbox)
+        isMakeBeforeRunCheckbox.addItemListener {
+            scratchFile.saveOptions {
+                copy(isMakeBeforeRun = isMakeBeforeRunCheckbox.isSelected)
+            }
+        }
+
         add(JSeparator(SwingConstants.VERTICAL))
 
         isReplCheckbox = JCheckBox("Use REPL")
@@ -84,16 +91,6 @@ class ScratchTopPanel private constructor(val scratchFile: ScratchFile) : JPanel
 
         add(JSeparator(SwingConstants.VERTICAL))
 
-        isMakeBeforeRunCheckbox = JCheckBox("Make before Run")
-        add(isMakeBeforeRunCheckbox)
-        isMakeBeforeRunCheckbox.addItemListener {
-            scratchFile.saveOptions {
-                copy(isMakeBeforeRun = isMakeBeforeRunCheckbox.isSelected)
-            }
-        }
-
-        add(JSeparator(SwingConstants.VERTICAL))
-
         scratchFile.options.let {
             isReplCheckbox.isSelected = it.isRepl
             isMakeBeforeRunCheckbox.isSelected = it.isMakeBeforeRun