diff --git a/analysis/analysis-api/testData/referenceResolve/thisWithLabelToFunction_caretAtThis.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToFunction_caretAtThis.descriptors.txt
new file mode 100644
index 00000000000..566da18e32c
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToFunction_caretAtThis.descriptors.txt
@@ -0,0 +1,2 @@
+Resolved to:
+0: (in Foo) fun kotlin.String.foo()
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtThis.descriptors.txt b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtThis.descriptors.txt
new file mode 100644
index 00000000000..f5111384fe1
--- /dev/null
+++ b/analysis/analysis-api/testData/referenceResolve/thisWithLabelToProperty_caretAtThis.descriptors.txt
@@ -0,0 +1,2 @@
+Resolved to:
+0: (in Foo) val kotlin.String.foo: kotlin.Any
\ No newline at end of file
diff --git a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10SimpleNameReference.kt b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10SimpleNameReference.kt
index 1873eb4237d..5024fdfa8c7 100644
--- a/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10SimpleNameReference.kt
+++ b/analysis/kt-references/kt-references-fe10/src/org/jetbrains/kotlin/references/fe10/KtFe10SimpleNameReference.kt
@@ -12,13 +12,11 @@ import org.jetbrains.kotlin.references.fe10.base.KtFe10ReferenceResolutionHelper
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.idea.references.readWriteAccess
-import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.load.java.descriptors.JavaPropertyDescriptor
 import org.jetbrains.kotlin.plugin.references.SimpleNameReferenceExtension
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.ImportedFromObjectCallableDescriptor
-import org.jetbrains.kotlin.resolve.calls.util.getResolvedCall
 import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor
 
 
@@ -67,9 +65,7 @@ class KtFe10SimpleNameReference(expression: KtSimpleNameExpression) : KtSimpleNa
                 target?.let { context[BindingContext.DECLARATION_TO_DESCRIPTOR, it] }
             }
             is KtReferenceExpression -> {
-                context[BindingContext.REFERENCE_TARGET, this]?.takeIf {
-                    this !is KtNameReferenceExpression || getReferencedNameElementType() != KtTokens.THIS_KEYWORD
-                } ?: getResolvedCall(context)?.resultingDescriptor
+                context[BindingContext.REFERENCE_TARGET, this]
             }
             else -> {
                 null