diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java
index 823bba043d7e..c5a04f0849c8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java
@@ -814,4 +814,17 @@ public class PsiImplUtil {
     }
     return result.toArray(new GrStatement[result.size()]);
   }
+
+  public static GrNamedArgument findNamedArgument(final GrNamedArgumentsOwner namedArgumentOwner,
+                                                  String label) {
+    for (PsiElement cur = namedArgumentOwner.getFirstChild(); cur != null; cur = cur.getNextSibling()) {
+      if (cur instanceof GrNamedArgument) {
+        if (label.equals(((GrNamedArgument)cur).getLabelName())) {
+          return (GrNamedArgument)cur;
+        }
+      }
+    }
+
+    return null;
+  }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java
index 0c62786ac181..15791c2f4fb1 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrListOrMapImpl.java
@@ -136,15 +136,7 @@ public class GrListOrMapImpl extends GrExpressionImpl implements GrListOrMap {
 
   @Override
   public GrNamedArgument findNamedArgument(@NotNull String label) {
-    for (PsiElement cur = getFirstChild(); cur != null; cur = cur.getNextSibling()) {
-      if (cur instanceof GrNamedArgument) {
-        if (label.equals(((GrNamedArgument)cur).getLabelName())) {
-          return (GrNamedArgument)cur;
-        }
-      }
-    }
-
-    return null;
+    return PsiImplUtil.findNamedArgument(this, label);
   }
 
   @Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentListImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentListImpl.java
index 0fccca80fbfe..3f09e107d7ab 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentListImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentListImpl.java
@@ -34,6 +34,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgument
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrNamedArgument;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
 import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyPsiElementImpl;
+import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
 import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil;
 
 import java.util.ArrayList;
@@ -69,15 +70,7 @@ public class GrArgumentListImpl extends GroovyPsiElementImpl implements GrArgume
 
   @Override
   public GrNamedArgument findNamedArgument(@NotNull String label) {
-    for (PsiElement cur = getFirstChild(); cur != null; cur = cur.getNextSibling()) {
-      if (cur instanceof GrNamedArgument) {
-        if (label.equals(((GrNamedArgument)cur).getLabelName())) {
-          return (GrNamedArgument)cur;
-        }
-      }
-    }
-
-    return null;
+    return PsiImplUtil.findNamedArgument(this, label);
   }
 
   @NotNull