diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
index 23783532227..527234af01d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.run.JetRunConfigurationEditor">
-  <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
+      <xy x="20" y="20" width="811" height="400"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -18,7 +18,7 @@
       </component>
       <vspacer id="f22cb">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="1378e" class="javax.swing.JTextField" binding="myMainClassField">
@@ -31,7 +31,7 @@
       </component>
       <grid id="53a18" binding="myModuleChooserHolder" layout-manager="BorderLayout" hgap="0" vgap="0">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -43,6 +43,12 @@
         </constraints>
         <properties/>
       </component>
+      <component id="b06d8" class="com.intellij.execution.ui.AlternativeJREPanel" binding="alternativeJREPanel">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
index 2fd241402b1..a776d040e04 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.idea.run;
 
+import com.intellij.execution.ui.AlternativeJREPanel;
 import com.intellij.execution.ui.CommonJavaParametersPanel;
 import com.intellij.execution.ui.ConfigurationModuleSelector;
 import com.intellij.openapi.options.ConfigurationException;
@@ -34,6 +35,7 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
     private JTextField myMainClassField;
     private JPanel myModuleChooserHolder;
     private CommonJavaParametersPanel myCommonProgramParameters;
+    private AlternativeJREPanel alternativeJREPanel;
     private ConfigurationModuleSelector myModuleSelector;
 
     public JetRunConfigurationEditor(Project project) {
@@ -54,6 +56,7 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
         myCommonProgramParameters.reset(configuration);
         myMainClassField.setText(configuration.getRunClass() == null ? null : configuration.getRunClass());
         myModuleSelector.reset(configuration);
+        alternativeJREPanel.init(configuration.getAlternativeJrePath(), configuration.isAlternativeJrePathEnabled());
     }
 
     @Override
@@ -61,6 +64,8 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
         myModuleSelector.applyTo(configuration);
         myCommonProgramParameters.applyTo(configuration);
         configuration.setRunClass(myMainClassField.getText());
+        configuration.setAlternativeJrePath(alternativeJREPanel.getPath());
+        configuration.setAlternativeJrePathEnabled(alternativeJREPanel.isPathEnabled());
     }
 
     @NotNull