diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeInEnumInitializer.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeInEnumInitializer.java
new file mode 100644
index 000000000000..ef9242c3f50a
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addAssert/beforeInEnumInitializer.java
@@ -0,0 +1,6 @@
+// "Assert 'field != null'" "false"
+enum A {
+  I(field.<caret>hashCode());
+  private static Object field;
+  A(int i) {}
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CodeBlockSurrounder.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CodeBlockSurrounder.java
index 1febed2c3319..6ff9182be24d 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CodeBlockSurrounder.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/CodeBlockSurrounder.java
@@ -249,7 +249,7 @@ public abstract class CodeBlockSurrounder {
       }
       return null;
     }
-    if (parent instanceof PsiField) {
+    if (parent instanceof PsiField && !(parent instanceof PsiEnumConstant)) {
       return new ExtractFieldInitializerSurrounder(expression, (PsiField)parent);
     }