diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java
index 31fa32e5197f..699780378df3 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/ModuleNode.java
@@ -106,7 +106,7 @@ public class ModuleNode extends ExternalSystemNode<ModuleData> {
       }
       ProjectNode parentProject = findParent(ProjectNode.class);
       if (parentProject != null) {
-        return StringUtil.equals(parentProject.getIdeGrouping(), getIdeParentGrouping());
+        return StringUtil.equals(parentProject.getName(), getIdeParentGrouping());
       }
     }
     return super.isVisible();
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
index 95bc3e5d3371..e7cad7a21495 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
@@ -233,12 +233,14 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
 
   @NotNull
   protected String[] getIdeModuleGroup(String moduleName, IdeaModule gradleModule) {
-    String[] moduleGroup;
     final String gradlePath = gradleModule.getGradleProject().getPath();
     final String rootName = gradleModule.getProject().getName();
-    final boolean isRootModule = StringUtil.isEmpty(gradlePath) || ":".equals(gradlePath);
-    moduleGroup = isRootModule ? new String[]{moduleName} : (rootName + gradlePath).split(":");
-    return moduleGroup;
+    if (StringUtil.isEmpty(gradlePath) || ":".equals(gradlePath)) {
+      return rootName.equals(moduleName) ? new String[]{moduleName} : new String[]{rootName, moduleName};
+    }
+    else {
+      return (rootName + gradlePath).split(":");
+    }
   }
 
   @Nullable