diff --git a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java
index 2d7dd2f7ca16..64dafbc05190 100644
--- a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java
+++ b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java
@@ -91,7 +91,7 @@ public class ConfigurationModuleSelector {
     myModules.setSelectedItem(configuration.getConfigurationModule().getModule());
   }
 
-  public static boolean isModuleAccepted(final Module module) {
+  public boolean isModuleAccepted(final Module module) {
     return ModuleTypeManager.getInstance().isClasspathProvider(ModuleType.get(module));
   }
 
diff --git a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java
index 88b7d5df48a6..4c24b71a6a4b 100644
--- a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java
+++ b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.ui.PanelWithAnchor;
 import com.intellij.ui.RawCommandLineEditor;
 import com.intellij.ui.components.JBLabel;
+import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -73,7 +74,16 @@ public class AndroidRunConfigurationEditor<T extends AndroidRunConfigurationBase
     myCommandLineField = myCommandLineComponent.getComponent();
     myCommandLineField.setDialogCaption(myCommandLineComponent.getRawText());
     myCommandLineComponent.getLabel().setLabelFor(myCommandLineField.getTextField());
-    myModuleSelector = new ConfigurationModuleSelector(project, myModulesComboBox);
+    myModuleSelector = new ConfigurationModuleSelector(project, myModulesComboBox) {
+      @Override
+      public boolean isModuleAccepted(Module module) {
+        if (module == null || !super.isModuleAccepted(module)) {
+          return false;
+        }
+        final AndroidFacet facet = AndroidFacet.getInstance(module);
+        return facet != null && !facet.getConfiguration().LIBRARY_PROJECT;
+      }
+    };
 
     myAvdComboComponent.setComponent(new AvdComboBox(true, false) {
       @Override