diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
index e6023fd5f7b8..901685def43a 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -89,6 +89,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     return group;
   }
 
+  @Override
   @Nullable
   public String getGeneratedName() {
     if (MAIN_CLASS_NAME == null) {
@@ -119,6 +120,9 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
   }
 
   public String suggestedName() {
+    if (MAIN_CLASS_NAME == null || MAIN_CLASS_NAME.length() == 0) {
+      return getName();
+    }
     return ProgramRunnerUtil.shortenName(JavaExecutionUtil.getShortClassName(MAIN_CLASS_NAME), 6) + ".main()";
   }
 
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java
index 8d9aab064172..36952a5b22d5 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.JDOMExternalizable;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public abstract class RuntimeConfiguration extends RunConfigurationBase implements LocatableConfiguration, Cloneable, ModuleRunConfiguration {
   public static final DataKey<RuntimeConfiguration> DATA_KEY = DataKey.create("runtimeConfiguration");
@@ -60,4 +61,9 @@ public abstract class RuntimeConfiguration extends RunConfigurationBase implemen
   @NonNls public String suggestedName() {
     return null;
   }
+
+  @Nullable
+  public String getGeneratedName() {
+    return suggestedName();
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
index 67248bbda6c8..f0fab2231765 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
@@ -289,6 +289,20 @@ class RunConfigurable extends BaseConfigurable {
     info.getEditor().addSettingsEditorListener(new SettingsEditorListener<RunnerAndConfigurationSettings>() {
       public void stateChanged(final SettingsEditor<RunnerAndConfigurationSettings> editor) {
         update();
+        final RunConfiguration configuration = info.getConfiguration();
+        if (configuration instanceof RuntimeConfiguration) {
+          final RuntimeConfiguration runtimeConfiguration = (RuntimeConfiguration)configuration;
+          if (runtimeConfiguration.isGeneratedName()) {
+            try {
+              final String generatedName = ((RuntimeConfiguration)editor.getSnapshot().getConfiguration()).getGeneratedName();
+              if (generatedName != null && generatedName.length() > 0) {
+                info.setNameText(generatedName);
+              }
+            }
+            catch (ConfigurationException ignore) {
+            }
+          }
+        }
         setupDialogBounds();
       }
     });