diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
index a549c928659c..fa4ec428ed86 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
@@ -72,7 +72,8 @@ class ConstructorInsertHandler implements InsertHandler<LookupElementDecorator<L
     if (delegate instanceof PsiTypeLookupItem) {
       fillTypeArgs = !isRawTypeExpected(context, (PsiTypeLookupItem)delegate) &&
                      psiClass.getTypeParameters().length > 0 &&
-                     ((PsiTypeLookupItem)delegate).calcGenerics(position).isEmpty();
+                     ((PsiTypeLookupItem)delegate).calcGenerics(position).isEmpty() &&
+                     context.getCompletionChar() != '(';
       delegate.handleInsert(context);
       PostprocessReformattingAspect.getInstance(context.getProject()).doPostponedFormatting(context.getFile().getViewProvider());
     }
@@ -99,7 +100,7 @@ class ConstructorInsertHandler implements InsertHandler<LookupElementDecorator<L
       editor.getDocument().insertString(offset, " {}");
       editor.getCaretModel().moveToOffset(offset + 2);
 
-      if (fillTypeArgs && promptTypeArgs(context, context.getOffset(insideRef))) return;
+      if (fillTypeArgs && JavaCompletionUtil.promptTypeArgs(context, context.getOffset(insideRef))) return;
 
       context.setLaterRunnable(generateAnonymousBody(editor, context.getFile()));
     }
@@ -116,7 +117,7 @@ class ConstructorInsertHandler implements InsertHandler<LookupElementDecorator<L
       if (mySmart) {
         FeatureUsageTracker.getInstance().triggerFeatureUsed(JavaCompletionFeatures.AFTER_NEW);
       }
-      if (fillTypeArgs && promptTypeArgs(context, context.getOffset(insideRef))) return;
+      if (fillTypeArgs && JavaCompletionUtil.promptTypeArgs(context, context.getOffset(insideRef))) return;
     }
   }
 
@@ -136,23 +137,6 @@ class ConstructorInsertHandler implements InsertHandler<LookupElementDecorator<L
     return false;
   }
 
-  static boolean promptTypeArgs(InsertionContext context, int offset) {
-    if (offset < 0) {
-      return false;
-    }
-
-    OffsetKey key = context.trackOffset(offset, false);
-    PostprocessReformattingAspect.getInstance(context.getProject()).doPostponedFormatting();
-    offset = context.getOffset(key);
-    if (offset < 0) {
-      return false;
-    }
-
-    context.getDocument().insertString(offset, "<>");
-    context.getEditor().getCaretModel().moveToOffset(offset + 1);
-    return true;
-  }
-
   public static boolean insertParentheses(InsertionContext context,
                                           LookupItem delegate,
                                           final PsiClass psiClass,
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
index e93f0c426919..12f1ec79ad7b 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
@@ -125,8 +125,8 @@ class JavaClassNameInsertHandler implements InsertHandler<JavaPsiClassReferenceE
       }
     }
 
-    if (fillTypeArgs) {
-      ConstructorInsertHandler.promptTypeArgs(context, context.getOffset(refEnd));
+    if (fillTypeArgs && context.getCompletionChar() != '(') {
+      JavaCompletionUtil.promptTypeArgs(context, context.getOffset(refEnd));
     }
   }
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
index 9000a39a6bd1..d876f0ad9ba8 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
@@ -44,6 +44,7 @@ import com.intellij.psi.filters.ElementFilter;
 import com.intellij.psi.filters.element.ExcludeDeclaredFilter;
 import com.intellij.psi.filters.element.ExcludeSillyAssignment;
 import com.intellij.psi.html.HtmlTag;
+import com.intellij.psi.impl.source.PostprocessReformattingAspect;
 import com.intellij.psi.impl.source.PsiImmediateClassType;
 import com.intellij.psi.javadoc.PsiDocToken;
 import com.intellij.psi.scope.BaseScopeProcessor;
@@ -909,4 +910,21 @@ public class JavaCompletionUtil {
     }
     return !hasAccessibleInnerClass(psiClass, position);
   }
+
+  public static boolean promptTypeArgs(InsertionContext context, int offset) {
+    if (offset < 0) {
+      return false;
+    }
+
+    OffsetKey key = context.trackOffset(offset, false);
+    PostprocessReformattingAspect.getInstance(context.getProject()).doPostponedFormatting();
+    offset = context.getOffset(key);
+    if (offset < 0) {
+      return false;
+    }
+
+    context.getDocument().insertString(offset, "<>");
+    context.getEditor().getCaretModel().moveToOffset(offset + 1);
+    return true;
+  }
 }
diff --git a/java/java-tests/testData/codeInsight/completion/normal/NoGenericsWhenChoosingWithParen.java b/java/java-tests/testData/codeInsight/completion/normal/NoGenericsWhenChoosingWithParen.java
new file mode 100644
index 000000000000..221d42854115
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/NoGenericsWhenChoosingWithParen.java
@@ -0,0 +1,5 @@
+class Foo {
+  {
+    new Hash<caret>
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/normal/NoGenericsWhenChoosingWithParen_after.java b/java/java-tests/testData/codeInsight/completion/normal/NoGenericsWhenChoosingWithParen_after.java
new file mode 100644
index 000000000000..0bb51b1d4489
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/NoGenericsWhenChoosingWithParen_after.java
@@ -0,0 +1,7 @@
+import java.util.HashMap;
+
+class Foo {
+  {
+    new HashMap(<caret>)
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
index dc148649b4f3..34f9775862df 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -1258,4 +1258,10 @@ public class ListUtils {
     }
   }
 
+  public void testNoGenericsWhenChoosingWithParen() {
+    configure()
+    myFixture.type 'Ma('
+    checkResult()
+  }
+
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyClassNameInsertHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyClassNameInsertHandler.java
index e73b13cb07a8..bb8ee2be533a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyClassNameInsertHandler.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyClassNameInsertHandler.java
@@ -88,10 +88,9 @@ public class GroovyClassNameInsertHandler implements InsertHandler<JavaPsiClassR
       GroovyPsiElement place = PsiTreeUtil.findElementOfClassAtOffset(context.getFile(), context.getStartOffset(), GroovyPsiElement.class, false);
       JavaCompletionUtil.insertParentheses(context, item, false, place != null && GroovyCompletionUtil.hasConstructorParameters(psiClass, place));
 
-      if (context.getCompletionChar() == '<' || psiClass.hasTypeParameters()) {
-        context.getDocument().insertString(identifierEnd, "<>");
+      if (context.getCompletionChar() == '<' || psiClass.hasTypeParameters() && context.getCompletionChar() != '(') {
         context.setAddCompletionChar(false);
-        context.getEditor().getCaretModel().moveToOffset(identifierEnd + 1);
+        JavaCompletionUtil.promptTypeArgs(context, identifierEnd);
       }
     }