diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
index 92082adf905..4ec4f33c9cd 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
@@ -316,7 +316,7 @@ class BasicCompletionSession(
                 when (callTypeAndReceiver) {
                     is CallTypeAndReceiver.ANNOTATION -> {
                         classKindFilter = { it == ClassKind.ANNOTATION_CLASS }
-                        includeTypeAliases = false
+                        includeTypeAliases = true
                     }
 
                     is CallTypeAndReceiver.DEFAULT, is CallTypeAndReceiver.TYPE -> {
diff --git a/idea/idea-completion/testData/basic/common/annotations/TypeAliasToAnnotation.kt b/idea/idea-completion/testData/basic/common/annotations/TypeAliasToAnnotation.kt
new file mode 100644
index 00000000000..7455577eae8
--- /dev/null
+++ b/idea/idea-completion/testData/basic/common/annotations/TypeAliasToAnnotation.kt
@@ -0,0 +1,12 @@
+annotation class Anno
+typealias TypedAnno = Anno
+
+
+@Ty<caret>
+fun usage() {
+
+}
+
+// INVOCATION_COUNT: 0
+// EXIST: TypedAnno
+
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
index 617b0a9d0fd..39c511a4cf8 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JSBasicCompletionTestGenerated.java
@@ -1017,6 +1017,12 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
                 String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotationArg2.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("TypeAliasToAnnotation.kt")
+            public void testTypeAliasToAnnotation() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TypeAliasToAnnotation.kt");
+                doTest(fileName);
+            }
         }
 
         @TestMetadata("idea/idea-completion/testData/basic/common/autoPopup")
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
index 81d618adc85..3dfcd9a9157 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/JvmBasicCompletionTestGenerated.java
@@ -1017,6 +1017,12 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
                 String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TopLevelAnnotationArg2.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("TypeAliasToAnnotation.kt")
+            public void testTypeAliasToAnnotation() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/basic/common/annotations/TypeAliasToAnnotation.kt");
+                doTest(fileName);
+            }
         }
 
         @TestMetadata("idea/idea-completion/testData/basic/common/autoPopup")