diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationType.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationType.java
index 3e03e6e8b1d1..86dba55114ba 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationType.java
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationType.java
@@ -16,8 +16,10 @@
 package com.intellij.execution.applet;
 
 import com.intellij.execution.ExecutionBundle;
+import com.intellij.execution.configuration.ConfigurationFactoryEx;
 import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.configurations.ConfigurationType;
+import com.intellij.execution.configurations.ModuleBasedConfiguration;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
@@ -33,10 +35,15 @@ public class AppletConfigurationType implements ConfigurationType {
 
   /**reflection*/
   AppletConfigurationType() {
-    myFactory = new ConfigurationFactory(this) {
+    myFactory = new ConfigurationFactoryEx(this) {
       public RunConfiguration createTemplateConfiguration(Project project) {
         return new AppletConfiguration("", project, this);
       }
+
+      @Override
+      public void onNewConfigurationCreated(@NotNull RunConfiguration configuration) {
+        ((ModuleBasedConfiguration)configuration).onNewConfigurationCreated();
+      }
     };
   }
 
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationType.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationType.java
index dc3961a0bdf2..aaa321b09ad3 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationType.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationType.java
@@ -17,8 +17,10 @@ package com.intellij.execution.application;
 
 import com.intellij.execution.ExecutionBundle;
 import com.intellij.execution.RunConfigurationExtension;
+import com.intellij.execution.configuration.ConfigurationFactoryEx;
 import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.configurations.ConfigurationType;
+import com.intellij.execution.configurations.ModuleBasedConfiguration;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
@@ -41,7 +43,7 @@ public class ApplicationConfigurationType implements ConfigurationType {
 
   /**reflection*/
   public ApplicationConfigurationType() {
-    myFactory = new ConfigurationFactory(this) {
+    myFactory = new ConfigurationFactoryEx(this) {
       public RunConfiguration createTemplateConfiguration(Project project) {
         return new ApplicationConfiguration("", project, ApplicationConfigurationType.this);
       }
@@ -50,6 +52,11 @@ public class ApplicationConfigurationType implements ConfigurationType {
       public Icon getIcon(@NotNull final RunConfiguration configuration) {
         return RunConfigurationExtension.getIcon((ApplicationConfiguration)configuration, getIcon());
       }
+
+      @Override
+      public void onNewConfigurationCreated(@NotNull RunConfiguration configuration) {
+        ((ModuleBasedConfiguration)configuration).onNewConfigurationCreated();
+      }
     };
   }
 
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
index 96ee2dd6ee39..d759ca12f91d 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
@@ -114,4 +114,12 @@ public abstract class ModuleBasedConfiguration<ConfigurationModule extends RunCo
     }
     if (modules.contains(originalModule)) setModule(originalModule);
   }
+
+  public void onNewConfigurationCreated() {
+    final RunConfigurationModule configurationModule = getConfigurationModule();
+    if (configurationModule.getModule() == null) {
+      final Module[] modules = ModuleManager.getInstance(getProject()).getModules();
+      configurationModule.setModule(modules.length == 1 ? modules[0] : null);
+    }
+  }
 }
diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java
index f41597de897e..a71ae85b6b65 100644
--- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java
+++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java
@@ -18,8 +18,10 @@ package com.intellij.execution.junit;
 
 import com.intellij.execution.ExecutionBundle;
 import com.intellij.execution.RunConfigurationExtension;
+import com.intellij.execution.configuration.ConfigurationFactoryEx;
 import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.configurations.ConfigurationType;
+import com.intellij.execution.configurations.ModuleBasedConfiguration;
 import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
@@ -36,7 +38,7 @@ public class JUnitConfigurationType implements ConfigurationType {
 
   /**reflection*/
   public JUnitConfigurationType() {
-    myFactory = new ConfigurationFactory(this) {
+    myFactory = new ConfigurationFactoryEx(this) {
       public RunConfiguration createTemplateConfiguration(Project project) {
         return new JUnitConfiguration("", project, this);
       }
@@ -45,6 +47,11 @@ public class JUnitConfigurationType implements ConfigurationType {
       public Icon getIcon(@NotNull final RunConfiguration configuration) {
         return RunConfigurationExtension.getIcon((JUnitConfiguration)configuration, getIcon());
       }
+
+      @Override
+      public void onNewConfigurationCreated(@NotNull RunConfiguration configuration) {
+        ((ModuleBasedConfiguration)configuration).onNewConfigurationCreated();
+      }
     };
   }
 
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java
index 7cc32bf57c68..5f7da52415b4 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationType.java
@@ -26,10 +26,8 @@ import com.intellij.execution.Location;
 import com.intellij.execution.RunConfigurationExtension;
 import com.intellij.execution.RunManagerEx;
 import com.intellij.execution.RunnerAndConfigurationSettings;
-import com.intellij.execution.configurations.ConfigurationFactory;
-import com.intellij.execution.configurations.ConfigurationType;
-import com.intellij.execution.configurations.ConfigurationTypeUtil;
-import com.intellij.execution.configurations.RunConfiguration;
+import com.intellij.execution.configuration.ConfigurationFactoryEx;
+import com.intellij.execution.configurations.*;
 import com.intellij.execution.impl.RunManagerImpl;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
@@ -51,7 +49,7 @@ public class TestNGConfigurationType implements ConfigurationType
 
     public TestNGConfigurationType() {
 
-        myFactory = new ConfigurationFactory(this)
+        myFactory = new ConfigurationFactoryEx(this)
         {
             @Override
             public RunConfiguration createTemplateConfiguration(Project project) {
@@ -63,6 +61,11 @@ public class TestNGConfigurationType implements ConfigurationType
           public Icon getIcon(@NotNull final RunConfiguration configuration) {
             return RunConfigurationExtension.getIcon((TestNGConfiguration)configuration, ICON);
           }
+
+          @Override
+          public void onNewConfigurationCreated(@NotNull RunConfiguration configuration) {
+            ((ModuleBasedConfiguration)configuration).onNewConfigurationCreated();
+          }
         };
     }