diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
index 544bc2db92fa..9234c5935332 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
@@ -20,7 +20,6 @@ import com.intellij.codeInsight.TailTypes;
 import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupItem;
-import com.intellij.codeInsight.lookup.TailTypeDecorator;
 import com.intellij.patterns.ElementPattern;
 import com.intellij.patterns.PsiElementPattern;
 import com.intellij.patterns.PsiJavaElementPattern;
@@ -577,20 +576,17 @@ public class JavaCompletionData extends JavaAwareCompletionData{
         not(
           or(psiElement(PsiTypeCastExpression.class),
              psiElement(PsiSwitchLabelStatement.class),
-             psiElement(PsiExpressionStatement.class).withParent(psiElement(PsiCodeBlock.class).withParent(PsiSwitchStatement.class))
+             psiElement(PsiExpressionStatement.class)
           )
         )
       )),
       not(psiElement().afterLeaf("."))
     );
     if (exprKeywords.accepts(position)) {
-      result.addElement(TailTypeDecorator.withTail(createKeyword(position, PsiKeyword.NEW), TailType.SPACE));
-
-      if (!psiElement().withParent(psiElement(PsiReferenceExpression.class).withParent(PsiExpressionStatement.class)).accepts(position)) {
-        result.addElement(createKeyword(position, PsiKeyword.NULL));
-        result.addElement(createKeyword(position, PsiKeyword.TRUE));
-        result.addElement(createKeyword(position, PsiKeyword.FALSE));
-      }
+      result.addElement(createKeyword(position, PsiKeyword.NEW));
+      result.addElement(createKeyword(position, PsiKeyword.NULL));
+      result.addElement(createKeyword(position, PsiKeyword.TRUE));
+      result.addElement(createKeyword(position, PsiKeyword.FALSE));
     }
   }
 
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 c4be469facc7..a4c76afa65af 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -807,6 +807,9 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
     assertTrue 'do' in strings
     assertTrue 'new' in strings
     assertTrue 'try' in strings
+
+    strings.remove 'new'
+    assertFalse 'new' in strings
   }
 
   public void testExpressionKeywords() {