diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java
index 89a123347364..687f7a2a3576 100644
--- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureHandler.java
@@ -136,7 +136,7 @@ public class JavaChangeSignatureHandler implements ChangeSignatureHandler {
       return elementParent;
     }
     if (elementParent instanceof PsiClass && ((PsiClass)elementParent).getNameIdentifier()==element) {
-      if (((PsiClass)elementParent).isAnnotationType()) {
+      if (((PsiClass)elementParent).isAnnotationType() || ((PsiClass)elementParent).isEnum()) {
         return null;
       }
       return elementParent;
diff --git a/java/java-tests/testData/refactoring/changeSignatureTarget/disabledForEnum.java b/java/java-tests/testData/refactoring/changeSignatureTarget/disabledForEnum.java
new file mode 100644
index 000000000000..2245a8a54298
--- /dev/null
+++ b/java/java-tests/testData/refactoring/changeSignatureTarget/disabledForEnum.java
@@ -0,0 +1,3 @@
+enum <caret>E {
+  ;
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTargetTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTargetTest.java
index 9a860f98a786..5391cec1f45a 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTargetTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTargetTest.java
@@ -51,6 +51,11 @@ public class ChangeSignatureTargetTest extends LightCodeInsightTestCase {
     doTest("A1");
   }
 
+  public void testDisabledForEnum() throws Exception {
+    configureByFile("/refactoring/changeSignatureTarget/" + getTestName(true) + ".java");
+    assertNull(new JavaChangeSignatureHandler().findTargetMember(getFile(), getEditor()));
+  }
+
   private void doTest(String expectedMemberName) throws Exception {
     String basePath = "/refactoring/changeSignatureTarget/" + getTestName(true);
     @NonNls final String filePath = basePath + ".java";