diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
index 03f9e677a7d..980326475e4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
@@ -168,7 +168,7 @@ public class OperatorToFunctionIntention : JetSelfTargetingIntention<KtExpressio
 
             val transformation : String
             val replaced : KtElement
-            if (parent is KtBinaryExpression && parent.getOperationReference().getReferencedNameElementType() == KtTokens.EQ) {
+            if (parent is KtBinaryExpression && parent.getOperationReference().getReferencedNameElementType() == KtTokens.EQ && element == parent.left) {
                 // part of an assignment
                 val right = parent.getRight()!!.getText()
                 transformation = "$array.set($indicesText, $right)"
diff --git a/idea/testData/intentions/operatorToFunction/inRightSideOfAssignment.kt b/idea/testData/intentions/operatorToFunction/inRightSideOfAssignment.kt
new file mode 100644
index 00000000000..ef500b22e5b
--- /dev/null
+++ b/idea/testData/intentions/operatorToFunction/inRightSideOfAssignment.kt
@@ -0,0 +1,4 @@
+fun foo(map: Map<String, String>) {
+    val a: String?
+    a = map<caret>[""]
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/operatorToFunction/inRightSideOfAssignment.kt.after b/idea/testData/intentions/operatorToFunction/inRightSideOfAssignment.kt.after
new file mode 100644
index 00000000000..1d8dba9e9ab
--- /dev/null
+++ b/idea/testData/intentions/operatorToFunction/inRightSideOfAssignment.kt.after
@@ -0,0 +1,4 @@
+fun foo(map: Map<String, String>) {
+    val a: String?
+    a = map.get("")
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 40f67478d5b..d8f395db3bb 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -5919,6 +5919,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("inRightSideOfAssignment.kt")
+        public void testInRightSideOfAssignment() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/inRightSideOfAssignment.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("notApplicableAssignment.kt")
         public void testNotApplicableAssignment() throws Exception {
             String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableAssignment.kt");