diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
index bed057a384d..93c54fc2bea 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyMemberScope.java
@@ -245,6 +245,9 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
                         getProperties(name);
                     }
                 }
+                else if (declaration instanceof JetTypedef) {
+                    // Do nothing as typedefs are not supported
+                }
                 else {
                     throw new IllegalArgumentException("Unsupported declaration kind: " + declaration);
                 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java
index 774c77289a9..cf236fc91cc 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/AbstractPsiBasedDeclarationProvider.java
@@ -64,7 +64,7 @@ public abstract class AbstractPsiBasedDeclarationProvider implements Declaration
             JetClassOrObject classOrObject = (JetClassOrObject) declaration;
             classesAndObjects.put(classOrObject.getNameAsName(), classOrObject);
         }
-        else if (declaration instanceof JetParameter) {
+        else if (declaration instanceof JetParameter || declaration instanceof JetTypedef) {
             // Do nothing, just put it into allDeclarations is enough
         }
         else {
diff --git a/idea/testData/completion/basic/InFileWithTypedef.kt b/idea/testData/completion/basic/InFileWithTypedef.kt
new file mode 100644
index 00000000000..86abaeacc3c
--- /dev/null
+++ b/idea/testData/completion/basic/InFileWithTypedef.kt
@@ -0,0 +1,9 @@
+class TestClassName
+type TestAlias = TestClassName
+
+val a: Tes<caret>
+
+// Regression for EA-38287 and KT-2758
+
+// EXIST: TestClassName
+// ABSENT: TestAlias
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java b/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java
index cd666e4dbed..30a9618ec4c 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java
+++ b/idea/tests/org/jetbrains/jet/completion/JetBasicCompletionTest.java
@@ -100,6 +100,10 @@ public class JetBasicCompletionTest extends JetCompletionTestBase {
         doTest();
     }
 
+    public void testInFileWithTypedef() {
+        doTest();
+    }
+
     public void testInFunInClassInitializer() {
         doTest();
     }