diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java b/idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java
index 3e440a58e13..56a47a0ec26 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java
@@ -27,11 +27,12 @@ public class KotlinModuleTypeManagerImpl extends KotlinModuleTypeManager {
     public boolean isAndroidGradleModule(@NotNull Module module) {
         // We don't want to depend on the Android-Gradle plugin
         // See com.android.tools.idea.gradle.util.Projects.isGradleProject()
+        boolean hasAndroidFacet = false;
         for (Facet facet : FacetManager.getInstance(module).getAllFacets()) {
-            if (facet.getName().equals("Android-Gradle")) {
-                return true;
+            if (facet.getName().equals("Android")) {
+                hasAndroidFacet = true;
             }
         }
-        return false;
+        return hasAndroidFacet && isGradleModule(module);
     }
 }