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 b951abef72a5..d8539d264b5c 100644
--- a/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
+++ b/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
@@ -22,8 +22,12 @@ import com.intellij.ide.fileTemplates.FileTemplateManager;
 import com.intellij.ide.fileTemplates.JavaCreateFromTemplateHandler;
 import com.intellij.ide.fileTemplates.JavaTemplateUtil;
 import com.intellij.ide.highlighter.JavaFileType;
+import com.intellij.lang.LanguageNamesValidation;
+import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.LanguageLevelProjectExtension;
+import com.intellij.openapi.ui.InputValidatorEx;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.JavaDirectoryService;
 import com.intellij.psi.PsiClass;
@@ -46,7 +50,7 @@ public class CreateClassAction extends JavaCreateTemplateInPackageAction<PsiClas
   }
 
   @Override
-  protected void buildDialog(Project project, PsiDirectory directory, CreateFileFromTemplateDialog.Builder builder) {
+  protected void buildDialog(final Project project, PsiDirectory directory, CreateFileFromTemplateDialog.Builder builder) {
     builder
       .setTitle(IdeBundle.message("action.create.new.class"))
       .addKind("Class", PlatformIcons.CLASS_ICON, JavaTemplateUtil.INTERNAL_CLASS_TEMPLATE_NAME)
@@ -55,13 +59,33 @@ public class CreateClassAction extends JavaCreateTemplateInPackageAction<PsiClas
       builder.addKind("Enum", PlatformIcons.ENUM_ICON, JavaTemplateUtil.INTERNAL_ENUM_TEMPLATE_NAME);
       builder.addKind("Annotation", PlatformIcons.ANNOTATION_TYPE_ICON, JavaTemplateUtil.INTERNAL_ANNOTATION_TYPE_TEMPLATE_NAME);
     }
-
+    
     for (FileTemplate template : FileTemplateManager.getInstance().getAllTemplates()) {
       final JavaCreateFromTemplateHandler handler = new JavaCreateFromTemplateHandler();
       if (handler.handlesTemplate(template) && JavaCreateFromTemplateHandler.canCreate(directory)) {
         builder.addKind(template.getName(), JavaFileType.INSTANCE.getIcon(), template.getName());
       }
     }
+    
+    builder.setValidator(new InputValidatorEx() {
+      @Override
+      public String getErrorText(String inputString) {
+        if (inputString.length() > 0 && !LanguageNamesValidation.INSTANCE.forLanguage(JavaLanguage.INSTANCE).isIdentifier(inputString, project)) {
+          return "This is not a valid Java identifier";          
+        }
+        return null;
+      }
+
+      @Override
+      public boolean checkInput(String inputString) {
+        return true;
+      }
+
+      @Override
+      public boolean canClose(String inputString) {
+        return !StringUtil.isEmptyOrSpaces(inputString) && getErrorText(inputString) == null;
+      }
+    });
   }
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateFileFromTemplateDialog.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateFileFromTemplateDialog.java
index 7d0f2c667adf..13e20762bd11 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/CreateFileFromTemplateDialog.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateFileFromTemplateDialog.java
@@ -18,14 +18,17 @@ package com.intellij.ide.actions;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.ui.InputValidator;
+import com.intellij.openapi.ui.InputValidatorEx;
 import com.intellij.openapi.util.Ref;
 import com.intellij.psi.PsiElement;
-import com.intellij.util.IncorrectOperationException;
+import com.intellij.ui.DocumentAdapter;
 import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import javax.swing.event.DocumentEvent;
 import java.util.Map;
 
 /**
@@ -39,6 +42,7 @@ public class CreateFileFromTemplateDialog extends DialogWrapper {
   private JLabel myKindLabel;
 
   private ElementCreator myCreator;
+  private InputValidator myInputValidator;
 
   protected CreateFileFromTemplateDialog(@NotNull Project project) {
     super(project, true);
@@ -46,9 +50,25 @@ public class CreateFileFromTemplateDialog extends DialogWrapper {
     myKindLabel.setLabelFor(myKindCombo);
     myKindCombo.registerUpDownHint(myNameField);
     myUpDownHint.setIcon(PlatformIcons.UP_DOWN_ARROWS);
+    myNameField.getDocument().addDocumentListener(new DocumentAdapter() {
+      @Override
+      protected void textChanged(DocumentEvent e) {
+        validateName();
+      }
+    });
     init();
   }
 
+  private void validateName() {
+    if (myInputValidator != null) {
+      final String text = myNameField.getText();
+      setOKActionEnabled(myInputValidator.canClose(text));
+      if (myInputValidator instanceof InputValidatorEx) {
+        setErrorText(((InputValidatorEx)myInputValidator).getErrorText(text));
+      }
+    }
+  }
+  
   protected JTextField getNameField() {
     return myNameField;
   }
@@ -91,6 +111,7 @@ public class CreateFileFromTemplateDialog extends DialogWrapper {
 
     private final CreateFileFromTemplateDialog myDialog;
     private final Project myProject;
+    private InputValidator myInputValidator;
 
     public BuilderImpl(CreateFileFromTemplateDialog dialog, Project project) {
       myDialog = dialog;
@@ -108,6 +129,12 @@ public class CreateFileFromTemplateDialog extends DialogWrapper {
       return this;
     }
 
+    @Override
+    public Builder setValidator(InputValidator validator) {
+      myDialog.myInputValidator = validator;
+      return this;
+    }
+
     public <T extends PsiElement> T show(@NotNull String errorTitle, @Nullable String selectedTemplateName,
                                          @NotNull final FileCreator<T> creator) {
       final Ref<T> created = Ref.create(null);
@@ -129,6 +156,7 @@ public class CreateFileFromTemplateDialog extends DialogWrapper {
           return creator.getActionName(newName, myDialog.getKindCombo().getSelectedName());
         }
       };
+      myDialog.validateName();
       myDialog.show();
       if (myDialog.getExitCode() == OK_EXIT_CODE) {
         return created.get();
@@ -145,6 +173,7 @@ public class CreateFileFromTemplateDialog extends DialogWrapper {
 
   public interface Builder {
     Builder setTitle(String title);
+    Builder setValidator(InputValidator validator);
     Builder addKind(@NotNull String kind, @Nullable Icon icon, @NotNull String templateName);
     @Nullable
     <T extends PsiElement> T show(@NotNull String errorTitle, @Nullable String selectedItem, @NotNull FileCreator<T> creator);