diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java
index 8ff32af49614..3b55f717f32b 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java
@@ -127,17 +127,7 @@ public class PermuteArgumentsFix implements IntentionAction {
         {
           ArrayUtil.rotateLeft(expressions, i, j);
           if (PsiUtil.isApplicable(method, substitutor, expressions)) {
-            PsiCall copy = (PsiCall)callExpression.copy();
-            PsiExpression[] copyExpressions = copy.getArgumentList().getExpressions();
-            for (int k = i; k < copyExpressions.length; k++) {
-              copyExpressions[k].replace(expressions[k]);
-            }
-
-            JavaResolveResult result = copy.resolveMethodGenerics();
-            if (result.getElement() != null && result.isValidResult()) {
-              permutations.add(copy);
-              if (permutations.size() > 1) return;
-            }
+            if (canShift(expressions, callExpression, permutations, i)) return;
           }
           ArrayUtil.rotateRight(expressions, i, j);
         }
@@ -145,17 +135,7 @@ public class PermuteArgumentsFix implements IntentionAction {
         {
           ArrayUtil.rotateRight(expressions, i, j);
           if (PsiUtil.isApplicable(method, substitutor, expressions)) {
-            PsiCall copy = (PsiCall)callExpression.copy();
-            PsiExpression[] copyExpressions = copy.getArgumentList().getExpressions();
-            for (int k = i; k < copyExpressions.length; k++) {
-              copyExpressions[k].replace(expressions[k]);
-            }
-
-            JavaResolveResult result = copy.resolveMethodGenerics();
-            if (result.getElement() != null && result.isValidResult()) {
-              permutations.add(copy);
-              if (permutations.size() > 1) return;
-            }
+            if (canShift(expressions, callExpression, permutations, i)) return;
           }
           ArrayUtil.rotateLeft(expressions, i, j);
         }
@@ -163,6 +143,24 @@ public class PermuteArgumentsFix implements IntentionAction {
     }
   }
 
+  private static boolean canShift(PsiExpression[] expressions, PsiCall callExpression, List<PsiCall> permutations, int i) {
+    PsiCall copy = LambdaUtil.copyTopLevelCall(callExpression);
+    if (copy == null) return false;
+    PsiExpressionList list = copy.getArgumentList();
+    if (list == null) return false;
+    PsiExpression[] copyExpressions = list.getExpressions();
+    for (int k = i; k < copyExpressions.length; k++) {
+      copyExpressions[k].replace(expressions[k]);
+    }
+
+    JavaResolveResult result = copy.resolveMethodGenerics();
+    if (result.getElement() != null && result.isValidResult()) {
+      permutations.add(copy);
+      if (permutations.size() > 1) return true;
+    }
+    return false;
+  }
+
   private static void registerSwapFixes(final PsiExpression[] expressions, final PsiCall callExpression, final List<PsiCall> permutations,
                                         MethodCandidateInfo candidate, final int incompatibilitiesCount, final int minIncompatibleIndex,
                                         final int maxIncompatibleIndex) throws IncorrectOperationException {
@@ -174,8 +172,11 @@ public class PermuteArgumentsFix implements IntentionAction {
       for (int j = i+1; j <= maxIncompatibleIndex; j++) {
         ArrayUtil.swap(expressions, i, j);
         if (PsiUtil.isApplicable(method, substitutor, expressions)) {
-          PsiCall copy = (PsiCall)callExpression.copy();
-          PsiExpression[] copyExpressions = copy.getArgumentList().getExpressions();
+          PsiCall copy = LambdaUtil.copyTopLevelCall(callExpression);
+          if (copy == null) return;
+          PsiExpressionList argumentList = copy.getArgumentList();
+          if (argumentList == null) return;
+          PsiExpression[] copyExpressions = argumentList.getExpressions();
           copyExpressions[i].replace(expressions[i]);
           copyExpressions[j].replace(expressions[j]);
           JavaResolveResult result = copy.resolveMethodGenerics();
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/permuteArguments/beforeSwapInEnumConstant.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/permuteArguments/beforeSwapInEnumConstant.java
new file mode 100644
index 000000000000..9fd1e0f3a723
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/permuteArguments/beforeSwapInEnumConstant.java
@@ -0,0 +1,19 @@
+// "Permute arguments" "false"
+enum SomeEnum {
+    VALUE_ONE(false, true),
+    VALUE_TWO(VALUE_ONE, fal<caret>se, false);
+
+    private final boolean flagOne;
+    private final boolean flagTwo;
+    private final SomeEnum parent;
+
+    SomeEnum(boolean flagOne, boolean flagTwo) {
+        this(flagOne, flagTwo, null);
+    }
+
+    SomeEnum(boolean flagOne, boolean flagTwo, SomeEnum parent) {
+        this.flagOne = flagOne;
+        this.flagTwo = flagTwo;
+        this.parent = parent;
+    }
+}
\ No newline at end of file