diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java
index 0fdde0bdcc85..36fa8ae89553 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiModifierListImpl.java
@@ -211,7 +211,10 @@ public class PsiModifierListImpl extends JavaStubPsiElement<PsiModifierListStub>
     // changes horizontal position of parameters list start, hence, we need to reformat them in order to preserve alignment.
     if (parent instanceof PsiMethod) {
       PsiMethod method = (PsiMethod)parent;
-      CodeEditUtil.markToReformat(method.getParameterList().getNode(), true);
+      ASTNode node = method.getParameterList().getNode();
+      if (node != null) { // could be a compact constructor parameter list
+        CodeEditUtil.markToReformat(node, true);
+      }
     }
 
     if (value) {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier14/afterCompactCtor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier14/afterCompactCtor.java
new file mode 100644
index 000000000000..414d8269ad84
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier14/afterCompactCtor.java
@@ -0,0 +1,4 @@
+// "Make 'R' public" "true"
+record R () {
+  public R {}
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier14/beforeCompactCtor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier14/beforeCompactCtor.java
new file mode 100644
index 000000000000..09bfc5e586b3
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier14/beforeCompactCtor.java
@@ -0,0 +1,4 @@
+// "Make 'R' public" "true"
+record R () {
+  <caret>R {}
+}
\ No newline at end of file