diff --git a/python/src/com/jetbrains/python/actions/PyQualifiedNameProvider.java b/python/src/com/jetbrains/python/actions/PyQualifiedNameProvider.java
index 024883766c03..79509794e015 100644
--- a/python/src/com/jetbrains/python/actions/PyQualifiedNameProvider.java
+++ b/python/src/com/jetbrains/python/actions/PyQualifiedNameProvider.java
@@ -15,17 +15,22 @@
  */
 package com.jetbrains.python.actions;
 
+import com.google.common.collect.Iterables;
 import com.intellij.ide.actions.QualifiedNameProvider;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorModificationUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
+import com.intellij.util.containers.ContainerUtil;
 import com.jetbrains.python.psi.PyClass;
 import com.jetbrains.python.psi.PyFunction;
 import com.jetbrains.python.psi.stubs.PyClassNameIndex;
+import com.jetbrains.python.psi.stubs.PyFunctionNameIndex;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+
 
 /**
  * User: anna
@@ -48,6 +53,9 @@ public class PyQualifiedNameProvider implements QualifiedNameProvider {
       if (containingClass != null) {
         return containingClass.getQualifiedName() + "#" + ((PyFunction)element).getName();
       }
+      else {
+        return ((PyFunction)element).getQualifiedName();
+      } 
     }
     return null;
   }
@@ -59,6 +67,10 @@ public class PyQualifiedNameProvider implements QualifiedNameProvider {
     if (aClass != null) {
       return aClass;
     }
+    final Collection<PyFunction> functions = PyFunctionNameIndex.find(fqn, project);
+    if (!functions.isEmpty()) {
+      return ContainerUtil.getFirstItem(functions);
+    }
     final int sharpIdx = fqn.indexOf("#");
     if (sharpIdx > -1) {
       final String className = StringUtil.getPackageName(fqn, '#');
diff --git a/python/testData/qualifiedName/topLevelFunctionReference/a/__init__.py b/python/testData/qualifiedName/topLevelFunctionReference/a/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/qualifiedName/topLevelFunctionReference/a/b/__init__.py b/python/testData/qualifiedName/topLevelFunctionReference/a/b/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/qualifiedName/topLevelFunctionReference/a/b/c/__init__.py b/python/testData/qualifiedName/topLevelFunctionReference/a/b/c/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/qualifiedName/topLevelFunctionReference/a/b/c/module.py b/python/testData/qualifiedName/topLevelFunctionReference/a/b/c/module.py
new file mode 100644
index 000000000000..c1015f4f20f2
--- /dev/null
+++ b/python/testData/qualifiedName/topLevelFunctionReference/a/b/c/module.py
@@ -0,0 +1,2 @@
+def fu<caret>nc():
+    pass
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PyQualifiedNameProviderTest.java b/python/testSrc/com/jetbrains/python/PyQualifiedNameProviderTest.java
new file mode 100644
index 000000000000..c57e3bcb542f
--- /dev/null
+++ b/python/testSrc/com/jetbrains/python/PyQualifiedNameProviderTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jetbrains.python;
+
+import com.jetbrains.python.actions.PyQualifiedNameProvider;
+import com.jetbrains.python.fixtures.PyTestCase;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+
+/**
+ * @author Mikhail Golubev
+ */
+public class PyQualifiedNameProviderTest extends PyTestCase {
+  @Test
+  public void testTopLevelFunctionReference() {
+    myFixture.copyDirectoryToProject(getTestName(true) + "/a", "a");
+    myFixture.configureByFile("a/b/c/module.py");
+    assertEquals("a.b.c.module.func", getQualifiedNameOfElementUnderCaret());
+  }
+
+  @Nullable
+  private String getQualifiedNameOfElementUnderCaret() {
+    return new PyQualifiedNameProvider().getQualifiedName(myFixture.getElementAtCaret());
+  }
+
+  @Override
+  protected String getTestDataPath() {
+    return super.getTestDataPath() + "/qualifiedName";
+  }
+}