diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java
index dc650d47fba4..de43d9527540 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java
@@ -259,7 +259,7 @@ public class GroovySmartCompletionContributor extends CompletionContributor {
 
     final LookupItem item = PsiTypeLookupItem.createLookupItem(JavaCompletionUtil.eliminateWildcards(type), place);
     JavaCompletionUtil.setShowFQN(item);
-    item.setInsertHandler(new AfterNewClassInsertHandler((PsiClassType)type, place, true));
+    item.setInsertHandler(new AfterNewClassInsertHandler((PsiClassType)type, true));
     return item;
   }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/AfterNewClassInsertHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/AfterNewClassInsertHandler.java
index bf6a0ead6808..b41e3e1ed0d3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/AfterNewClassInsertHandler.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/handlers/AfterNewClassInsertHandler.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.util.Condition;
 import com.intellij.psi.*;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.plugins.groovy.lang.completion.GroovyCompletionUtil;
+import org.jetbrains.plugins.groovy.lang.psi.GroovyFileBase;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
 import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil;
 
@@ -35,12 +36,10 @@ import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil;
  */
 public class AfterNewClassInsertHandler implements InsertHandler<LookupItem<PsiClassType>> {
   private final PsiClassType myClassType;
-  private final PsiElement myPlace;
   private final boolean myTriggerFeature;
 
-  public AfterNewClassInsertHandler(PsiClassType classType, PsiElement place, boolean triggerFeature) {
+  public AfterNewClassInsertHandler(PsiClassType classType, boolean triggerFeature) {
     myClassType = classType;
-    myPlace = place;
     myTriggerFeature = triggerFeature;
   }
 
@@ -50,15 +49,12 @@ public class AfterNewClassInsertHandler implements InsertHandler<LookupItem<PsiC
     if (psiClass == null || !psiClass.isValid()) {
       return;
     }
-    PsiElement place = myPlace;
-    if (!(place instanceof GroovyPsiElement)) {
-      place = myPlace.getContainingFile();
-    }
-    PsiMethod[] constructors = ResolveUtil.getAllClassConstructors(psiClass, (GroovyPsiElement)place, resolveResult.getSubstitutor());
+    final GroovyPsiElement place = obtainPlace(context);
+    PsiMethod[] constructors = ResolveUtil.getAllClassConstructors(psiClass, place, resolveResult.getSubstitutor());
     final PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(psiClass.getProject()).getResolveHelper();
     boolean hasParams = ContainerUtil.or(constructors, new Condition<PsiMethod>() {
       public boolean value(PsiMethod psiMethod) {
-        if (!resolveHelper.isAccessible(psiMethod, myPlace, null)) {
+        if (!resolveHelper.isAccessible(psiMethod, place, null)) {
           return false;
         }
 
@@ -80,5 +76,12 @@ public class AfterNewClassInsertHandler implements InsertHandler<LookupItem<PsiC
     if (hasParams) AutoPopupController.getInstance(constructors[0].getProject()).autoPopupParameterInfo(context.getEditor(), null);
   }
 
-  
+  private static GroovyPsiElement obtainPlace(InsertionContext context) {
+    PsiElement place = context.getFile().findElementAt(context.getStartOffset());
+    assert place != null;
+    if (place instanceof GroovyPsiElement) {
+      return (GroovyPsiElement)place;
+    }
+    return (GroovyFileBase)place.getContainingFile();
+  }
 }