diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
index 16e5f62cace..cd92d9fe6e6 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt
@@ -147,7 +147,7 @@ private fun QualifierReceiver.resolveAsReceiverInQualifiedExpression(context: Ex
         context.trace.report(TYPE_PARAMETER_ON_LHS_OF_DOT.on(referenceExpression, classifier as TypeParameterDescriptor))
     }
     else if (classifier is ClassDescriptor && classifier.classObjectDescriptor != null) {
-        context.trace.record(EXPRESSION_TYPE, referenceExpression, classifier.getClassObjectType())
+        context.trace.record(EXPRESSION_TYPE, expression, classifier.getClassObjectType())
     }
 }
 
diff --git a/idea/testData/completion/basic/common/extensions/ExtensionOnFQObject.kt b/idea/testData/completion/basic/common/extensions/ExtensionOnFQObject.kt
new file mode 100644
index 00000000000..a98c6b71108
--- /dev/null
+++ b/idea/testData/completion/basic/common/extensions/ExtensionOnFQObject.kt
@@ -0,0 +1,11 @@
+package foo
+
+object A
+
+fun A.foo() {}
+
+fun some() {
+    foo.A.<caret>
+}
+
+// EXIST: foo
diff --git a/idea/testData/completion/basic/common/extensions/ExtensionOnNestedClassObject.kt b/idea/testData/completion/basic/common/extensions/ExtensionOnNestedClassObject.kt
new file mode 100644
index 00000000000..0a21e79e69c
--- /dev/null
+++ b/idea/testData/completion/basic/common/extensions/ExtensionOnNestedClassObject.kt
@@ -0,0 +1,15 @@
+package foo
+
+class A {
+    class B {
+        class object
+    }
+}
+
+fun A.B.Default.foo() {}
+
+fun some() {
+    A.B.<caret>
+}
+
+// EXIST: foo
diff --git a/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java
index 8ea502d7631..8a7c135ca9d 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java
@@ -1059,6 +1059,18 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
                 doTest(fileName);
             }
 
+            @TestMetadata("ExtensionOnFQObject.kt")
+            public void testExtensionOnFQObject() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionOnFQObject.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("ExtensionOnNestedClassObject.kt")
+            public void testExtensionOnNestedClassObject() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionOnNestedClassObject.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("Extensions.kt")
             public void testExtensions() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/Extensions.kt");
diff --git a/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java
index 248715fc214..6c2964bb837 100644
--- a/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java
@@ -1059,6 +1059,18 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
                 doTest(fileName);
             }
 
+            @TestMetadata("ExtensionOnFQObject.kt")
+            public void testExtensionOnFQObject() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionOnFQObject.kt");
+                doTest(fileName);
+            }
+
+            @TestMetadata("ExtensionOnNestedClassObject.kt")
+            public void testExtensionOnNestedClassObject() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionOnNestedClassObject.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("Extensions.kt")
             public void testExtensions() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/Extensions.kt");