diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
index 75b3c2d5d3f..d2d51980adc 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt
@@ -130,7 +130,7 @@ sealed class CallTypeAndReceiver<TReceiver : KtElement?, out TCallType : CallTyp
     companion object {
         fun detect(expression: KtSimpleNameExpression): CallTypeAndReceiver<*, *> {
             val parent = expression.parent
-            if (parent is KtCallableReferenceExpression) {
+            if (parent is KtCallableReferenceExpression && expression == parent.callableReference) {
                 return CallTypeAndReceiver.CALLABLE_REFERENCE(parent.receiverExpression)
             }
 
diff --git a/idea/testData/editor/optimizeImports/CallableReference2.kt b/idea/testData/editor/optimizeImports/CallableReference2.kt
new file mode 100644
index 00000000000..e997a93dad0
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/CallableReference2.kt
@@ -0,0 +1,3 @@
+import javax.swing.SwingUtilities
+
+val x = SwingUtilities::invokeLater
\ No newline at end of file
diff --git a/idea/testData/editor/optimizeImports/CallableReference2.kt.after b/idea/testData/editor/optimizeImports/CallableReference2.kt.after
new file mode 100644
index 00000000000..e997a93dad0
--- /dev/null
+++ b/idea/testData/editor/optimizeImports/CallableReference2.kt.after
@@ -0,0 +1,3 @@
+import javax.swing.SwingUtilities
+
+val x = SwingUtilities::invokeLater
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
index 0ef25e00ccc..4f88ca19388 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java
@@ -53,6 +53,12 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
         doTest(fileName);
     }
 
+    @TestMetadata("CallableReference2.kt")
+    public void testCallableReference2() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/CallableReference2.kt");
+        doTest(fileName);
+    }
+
     @TestMetadata("ClassFromSameFileImportAddedBug.kt")
     public void testClassFromSameFileImportAddedBug() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ClassFromSameFileImportAddedBug.kt");