diff --git a/python/src/com/jetbrains/python/psi/PyFile.java b/python/src/com/jetbrains/python/psi/PyFile.java
index b73209231ae5..72678153be7f 100644
--- a/python/src/com/jetbrains/python/psi/PyFile.java
+++ b/python/src/com/jetbrains/python/psi/PyFile.java
@@ -3,11 +3,15 @@
  */
 package com.jetbrains.python.psi;
 
+import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiFile;
 
 import java.util.List;
 
 public interface PyFile extends PyElement, PsiFile {
+  
+  Key<Boolean> KEY_IS_DIRECTORY = Key.create("Dir impersonated by __init__.py");
+  
   List<PyStatement> getStatements();
 
   List<PyClass> getTopLevelClasses();
diff --git a/python/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java
index a822be04c3a3..36fff40d9472 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyReferenceExpressionImpl.java
@@ -36,9 +36,7 @@ import com.jetbrains.python.psi.types.PyType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by IntelliJ IDEA.
@@ -115,6 +113,7 @@ public class PyReferenceExpressionImpl extends PyElementImpl implements PyRefere
         final PsiFile file = dir.findFile(ResolveImportUtil.INIT_PY);
         if (file != null) {
           target = file; // ResolveImportUtil will extract directory part as needed.
+          file.putCopyableUserData(PyFile.KEY_IS_DIRECTORY, Boolean.TRUE);
           /* NOTE: can't return anything but a PyFile or PsiFileImpl.isPsiUpToDate() would fail.
           This is because isPsiUpToDate() relies on identity of objects returned by FileViewProvider.getPsi().
           If we ever need to exactly tell a dir from __init__.py, that logic has to change. 
@@ -318,4 +317,5 @@ public class PyReferenceExpressionImpl extends PyElementImpl implements PyRefere
 
     return null;
   }
+
 }