diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java
index eb90a3254fb5..c42cea0be714 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java
@@ -148,6 +148,10 @@ public abstract class GroovyElementVisitor {
     visitArgumentList(argumentList);
   }
 
+  public void visitElvisExpression(GrElvisExpression expression) {
+    visitConditionalExpression(expression);
+  }
+
   public void visitConditionalExpression(GrConditionalExpression expression) {
     visitExpression(expression);
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrElvisExprImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrElvisExprImpl.java
index 97f5a7473b79..1b056d7f13fc 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrElvisExprImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrElvisExprImpl.java
@@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions;
 
 import com.intellij.lang.ASTNode;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrElvisExpression;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
 
@@ -46,4 +47,8 @@ public class GrElvisExprImpl extends GrConditionalExprImpl implements GrElvisExp
     return null;
   }
 
+  @Override
+  public void accept(GroovyElementVisitor visitor) {
+    visitor.visitElvisExpression(this);
+  }
 }