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 570efa1de671..907779528bf8 100644
--- a/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
+++ b/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
@@ -83,6 +83,11 @@ public class CreateClassAction extends JavaCreateTemplateInPackageAction<PsiClas
     });
   }
 
+  @Override
+  protected String removeExtension(String templateName, String className) {
+    return super.removeExtension(templateName, StringUtil.trimEnd(className, ".java"));
+  }
+
   @Override
   protected String getErrorTitle() {
     return IdeBundle.message("title.cannot.create.class");
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java
index 51d36e7bbd9b..737297a64fce 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java
@@ -20,7 +20,6 @@ import com.intellij.ide.IdeView;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.LangDataKeys;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
@@ -83,12 +82,7 @@ public abstract class CreateTemplateInPackageAction<T extends PsiElement> extend
   @Nullable
   private T checkOrCreate(String newName, PsiDirectory directory, String templateName) throws IncorrectOperationException {
     PsiDirectory dir = directory;
-    String className = newName;
-
-    final String extension = StringUtil.getShortName(templateName);
-    if (StringUtil.isNotEmpty(extension)) {
-      className = StringUtil.trimEnd(className, "." + extension);
-    }
+    String className = removeExtension(templateName, newName);
 
     if (className.contains(".")) {
       String[] names = className.split("\\.");
@@ -110,6 +104,14 @@ public abstract class CreateTemplateInPackageAction<T extends PsiElement> extend
     return doCreate(dir, className, templateName);
   }
 
+  protected String removeExtension(String templateName, String className) {
+    final String extension = StringUtil.getShortName(templateName);
+    if (StringUtil.isNotEmpty(extension)) {
+      className = StringUtil.trimEnd(className, "." + extension);
+    }
+    return className;
+  }
+
   @Nullable
   protected abstract T doCreate(final PsiDirectory dir, final String className, String templateName) throws IncorrectOperationException;