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 3e13df602b5a..d10cce47486d 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java
@@ -83,7 +83,7 @@ class ConstructorInsertHandler implements InsertHandler<LookupElementDecorator<L
     }
   }
 
-  public static void insertParentheses(InsertionContext context, LookupItem delegate, final PsiClass psiClass) {
+  public static boolean insertParentheses(InsertionContext context, LookupItem delegate, final PsiClass psiClass) {
     final PsiElement place = context.getFile().findElementAt(context.getStartOffset());
     final PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(context.getProject()).getResolveHelper();
     assert place != null;
@@ -97,6 +97,7 @@ class ConstructorInsertHandler implements InsertHandler<LookupElementDecorator<L
     }
 
     JavaCompletionUtil.insertParentheses(context, delegate, false, hasParams);
+    return hasParams;
   }
 
   private static Runnable generateAnonymousBody(final Editor editor, final PsiFile file) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java
index 743f0b1482cc..b85d38f13035 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java
@@ -151,7 +151,7 @@ public class DefaultInsertHandler extends TemplateInsertHandler implements Clone
     }                                                                       
   }
 
-  private static boolean isAtTokenNeeded(InsertionContext myContext) {
+  static boolean isAtTokenNeeded(InsertionContext myContext) {
     HighlighterIterator iterator = ((EditorEx)myContext.getEditor()).getHighlighter().createIterator(myContext.getStartOffset());
     LOG.assertTrue(iterator.getTokenType() == JavaTokenType.IDENTIFIER);
     iterator.retreat();
@@ -256,7 +256,7 @@ public class DefaultInsertHandler extends TemplateInsertHandler implements Clone
     return false;
   }
 
-  private static boolean insertingAnnotationWithParameters(InsertionContext context, LookupElement item) {
+  public static boolean insertingAnnotationWithParameters(InsertionContext context, LookupElement item) {
     if(insertingAnnotation(context, item)) {
       final Document document = context.getEditor().getDocument();
       PsiDocumentManager.getInstance(context.getProject()).commitDocument(document);
@@ -275,7 +275,7 @@ public class DefaultInsertHandler extends TemplateInsertHandler implements Clone
     return false;
   }
 
-  private static boolean insertingAnnotation(InsertionContext context, LookupElement item) {
+  static boolean insertingAnnotation(InsertionContext context, LookupElement item) {
     final Object obj = item.getObject();
     if (!(obj instanceof PsiClass) || !((PsiClass)obj).isAnnotationType()) return false;
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java
index 0e2cd86abad8..9a31100b4b51 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java
@@ -15,13 +15,14 @@
  */
 package com.intellij.codeInsight.completion;
 
+import com.intellij.codeInsight.AutoPopupController;
 import com.intellij.codeInsight.ExpectedTypeInfo;
 import com.intellij.codeInsight.ExpectedTypesProvider;
-import com.intellij.codeInsight.TailType;
 import com.intellij.lang.LangBundle;
 import com.intellij.lang.StdLanguages;
 import com.intellij.openapi.actionSystem.IdeActions;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.patterns.PsiJavaElementPattern;
 import com.intellij.patterns.PsiJavaPatterns;
@@ -56,7 +57,12 @@ public class JavaClassNameCompletionContributor extends CompletionContributor {
       PsiMethod.class).andNot(psiElement().inside(PsiCodeBlock.class)).andNot(psiElement().inside(PsiParameterList.class));
   private static final InsertHandler<JavaPsiClassReferenceElement> JAVA_CLASS_INSERT_HANDLER = new InsertHandler<JavaPsiClassReferenceElement>() {
     public void handleInsert(final InsertionContext context, final JavaPsiClassReferenceElement item) {
-      context.setAddCompletionChar(false);
+      final char c = context.getCompletionChar();
+
+      if (c != '.' && c != ' ' && c != '#') {
+        context.setAddCompletionChar(false);
+      }
+
       int offset = context.getTailOffset() - 1;
       final PsiFile file = context.getFile();
       if (PsiTreeUtil.findElementOfClassAtOffset(file, offset, PsiImportStatementBase.class, false) != null) {
@@ -70,14 +76,16 @@ public class JavaClassNameCompletionContributor extends CompletionContributor {
 
       PsiElement position = file.findElementAt(offset);
       PsiClass psiClass = item.getObject();
+      final Project project = context.getProject();
+      final boolean annotation = DefaultInsertHandler.insertingAnnotation(context, item);
 
-      if (context.getCompletionChar() == '#') {
+      final Editor editor = context.getEditor();
+      if (c == '#') {
         context.setLaterRunnable(new Runnable() {
           public void run() {
-             new CodeCompletionHandlerBase(CompletionType.BASIC).invoke(context.getProject(), context.getEditor(), file);
+            new CodeCompletionHandlerBase(CompletionType.BASIC).invoke(project, editor, file);
           }
         });
-        TailType.insertChar(context.getEditor(), context.getTailOffset(), '#');
       }
 
       if (position != null) {
@@ -90,11 +98,31 @@ public class JavaClassNameCompletionContributor extends CompletionContributor {
       }
 
       if (completingRawConstructor(context, item) && !JavaCompletionUtil.hasAccessibleInnerClass(psiClass, file)) {
-        ConstructorInsertHandler.insertParentheses(context, item, psiClass);
-        DefaultInsertHandler.addImportForItem(context.getFile(), context.getStartOffset(), item);
-      } else {
-        new DefaultInsertHandler().handleInsert(context, item);
+        if (ConstructorInsertHandler.insertParentheses(context, item, psiClass)) {
+          AutoPopupController.getInstance(project).autoPopupParameterInfo(editor, null);
+        }
       }
+      else if (DefaultInsertHandler.insertingAnnotationWithParameters(context, item)) {
+        JavaCompletionUtil.insertParentheses(context, item, false, true);
+        AutoPopupController.getInstance(project).autoPopupParameterInfo(editor, null);
+      }
+      DefaultInsertHandler.addImportForItem(context.getFile(), context.getStartOffset(), item);
+
+      if (annotation) {
+        // Check if someone inserts annotation class that require @
+        PsiElement elementAt = file.findElementAt(context.getStartOffset());
+        final PsiElement parentElement = elementAt != null ? elementAt.getParent():null;
+
+        if (elementAt instanceof PsiIdentifier &&
+            (PsiTreeUtil.getParentOfType(elementAt, PsiAnnotationParameterList.class) != null ||
+             parentElement instanceof PsiErrorElement && parentElement.getParent() instanceof PsiJavaFile // top level annotation without @
+            )
+            && DefaultInsertHandler.isAtTokenNeeded(context)) {
+          int expectedOffsetForAtToken = elementAt.getTextRange().getStartOffset();
+          context.getDocument().insertString(expectedOffsetForAtToken, "@");
+        }
+      }
+
     }
 
     private boolean completingRawConstructor(InsertionContext context, JavaPsiClassReferenceElement item) {
diff --git a/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInnersTab.java b/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInnersTab.java
new file mode 100644
index 000000000000..723d66f49d22
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInnersTab.java
@@ -0,0 +1,16 @@
+public class TestClass {
+
+    public TestClass create() {
+        final int value = 1;
+        return new Xx<caret>TexCompXxx(value);
+    }
+}
+
+class Xxx {
+    private Xxx(String x) {
+    }
+
+    class Yyy {
+
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInnersTab_after.java b/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInnersTab_after.java
new file mode 100644
index 000000000000..28d5cebdbd75
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/ClassNameWithInnersTab_after.java
@@ -0,0 +1,16 @@
+public class TestClass {
+
+    public TestClass create() {
+        final int value = 1;
+        return new Xxx<caret>(value);
+    }
+}
+
+class Xxx {
+    private Xxx(String x) {
+    }
+
+    class Yyy {
+
+    }
+}
\ 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 3c50f548fe4e..02c591b8df3d 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -741,6 +741,12 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
     checkResult();
   }
 
+  public void testClassNameWithInnersTab() throws Throwable {
+    configure()
+    myFixture.type '\t'
+    checkResult();
+  }
+
   public void testRightShift() throws Throwable {
     configure()
     assertStringItems("myField1", "myField2");