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 91d463da7694..4f265740cc16 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameInsertHandler.java
@@ -71,6 +71,8 @@ class JavaClassNameInsertHandler implements InsertHandler<JavaPsiClassReferenceE
           new CodeCompletionHandlerBase(CompletionType.BASIC).invoke(project, editor, file);
         }
       });
+    } else if (c == '.' && PsiTreeUtil.getParentOfType(position, PsiParameterList.class) == null) {
+      AutoPopupController.getInstance(context.getProject()).autoPopupMemberLookup(context.getEditor(), null);
     }
 
     if (position != null) {
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
index 68dd66eca4a0..7103efd2f6a8 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/JavaAutoPopupTest.groovy
@@ -366,4 +366,26 @@ class JavaAutoPopupTest extends CompletionAutoPopupTestCase {
     assert lookup
   }
 
+  public void testDotAfterClassName() {
+    myFixture.configureByText("a.java", """
+    class A {
+      { <caret> }
+    }
+    """)
+    type 'FilInpStr.'
+    assert myFixture.file.text.contains("FileInputStream.")
+    assert lookup
+  }
+
+  public void testDotAfterClassNameInParameter() {
+    myFixture.configureByText("a.java", """
+    class A {
+      void foo(<caret>) {}
+    }
+    """)
+    type 'FilInpStr...'
+    assert myFixture.editor.document.text.contains("FileInputStream...")
+    assert !lookup
+  }
+
 }