diff --git a/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java b/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
index 6fc85e123636..6a480246a5dd 100644
--- a/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
+++ b/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
@@ -59,7 +59,7 @@ public class CreateClassAction extends JavaCreateTemplateInPackageAction<PsiClas
 
     for (FileTemplate template : FileTemplateManager.getInstance().getAllTemplates()) {
       final JavaCreateFromTemplateHandler handler = new JavaCreateFromTemplateHandler();
-      if (handler.handlesTemplate(template) && handler.canCreate(new PsiDirectory[]{directory})) {
+      if (handler.handlesTemplate(template) && JavaCreateFromTemplateHandler.canCreate(directory)) {
         builder.addKind(template.getName(), JavaFileType.INSTANCE.getIcon(), template.getName());
       }
     }
diff --git a/java/java-impl/src/com/intellij/ide/fileTemplates/JavaCreateFromTemplateHandler.java b/java/java-impl/src/com/intellij/ide/fileTemplates/JavaCreateFromTemplateHandler.java
index 5f2018c9700c..42f2ac443362 100644
--- a/java/java-impl/src/com/intellij/ide/fileTemplates/JavaCreateFromTemplateHandler.java
+++ b/java/java-impl/src/com/intellij/ide/fileTemplates/JavaCreateFromTemplateHandler.java
@@ -110,9 +110,10 @@ public class JavaCreateFromTemplateHandler implements CreateFromTemplateHandler
   }
 
   public boolean canCreate(final PsiDirectory[] dirs) {
-    for (PsiDirectory dir : dirs) {
-      if (JavaDirectoryService.getInstance().getPackage(dir) != null) return true;
-    }
     return false;
   }
+
+  public static boolean canCreate(PsiDirectory dir) {
+    return JavaDirectoryService.getInstance().getPackage(dir) != null;
+  }
 }