diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt
index 017e0037aae..f17049dfe53 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt
@@ -48,7 +48,8 @@ class ReplaceContainsIntention : SelfTargetingRangeIntention<KtDotQualifiedExpre
         if (!element.isReceiverExpressionWithValue()) return null
 
         val functionDescriptor = getFunctionDescriptor(element) ?: return null
-        if (!functionDescriptor.isOperator || !OperatorChecks.check(functionDescriptor).isSuccess) return null
+
+        if (!functionDescriptor.isOperator && !OperatorChecks.check(functionDescriptor).isSuccess) return null
 
         return element.callExpression!!.calleeExpression!!.textRange
     }
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/simpleStringLiteral.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/simpleStringLiteral.kt
new file mode 100644
index 00000000000..71d267653ae
--- /dev/null
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/simpleStringLiteral.kt
@@ -0,0 +1,6 @@
+@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
+public operator fun CharSequence.contains(other: CharSequence, ignoreCase: Boolean = false): Boolean = false
+fun test() {
+    val foo = "foo"
+    foo.c<caret>ontains("bar")
+}
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/simpleStringLiteral.kt.after b/idea/testData/intentions/conventionNameCalls/replaceContains/simpleStringLiteral.kt.after
new file mode 100644
index 00000000000..62cf21faca3
--- /dev/null
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/simpleStringLiteral.kt.after
@@ -0,0 +1,6 @@
+@Suppress("INAPPLICABLE_OPERATOR_MODIFIER")
+public operator fun CharSequence.contains(other: CharSequence, ignoreCase: Boolean = false): Boolean = false
+fun test() {
+    val foo = "foo"
+    "bar" in foo
+}
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/twoArgsContainsFromJava.1.java b/idea/testData/intentions/conventionNameCalls/replaceContains/twoArgsContainsFromJava.1.java
new file mode 100644
index 00000000000..03ca7a7eaeb
--- /dev/null
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/twoArgsContainsFromJava.1.java
@@ -0,0 +1,5 @@
+class Container {
+    public boolean contains(int x, int y) {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/twoArgsContainsFromJava.1.java.after b/idea/testData/intentions/conventionNameCalls/replaceContains/twoArgsContainsFromJava.1.java.after
new file mode 100644
index 00000000000..03ca7a7eaeb
--- /dev/null
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/twoArgsContainsFromJava.1.java.after
@@ -0,0 +1,5 @@
+class Container {
+    public boolean contains(int x, int y) {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/twoArgsContainsFromJava.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/twoArgsContainsFromJava.kt
new file mode 100644
index 00000000000..70c3a0dc653
--- /dev/null
+++ b/idea/testData/intentions/conventionNameCalls/replaceContains/twoArgsContainsFromJava.kt
@@ -0,0 +1,6 @@
+// IS_APPLICABLE: false
+
+fun foo() {
+    val c = Container()
+    c.cont<caret>ains(1, 2)
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/conventionNameCalls/replaceContains/withoutOperatorModifier.kt b/idea/testData/intentions/conventionNameCalls/replaceContains/withoutOperatorModifier.kt
deleted file mode 100644
index 117aaba4366..00000000000
--- a/idea/testData/intentions/conventionNameCalls/replaceContains/withoutOperatorModifier.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// IS_APPLICABLE: false
-
-fun test() {
-    class Test{
-        fun contains(a: Int) : Boolean = true
-    }
-    val test = Test()
-    test.c<caret>ontains(0)
-}
\ 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 0f1ed5e3007..7ee26b22bcf 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -3140,12 +3140,24 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("simpleStringLiteral.kt")
+            public void testSimpleStringLiteral() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/simpleStringLiteral.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("super.kt")
             public void testSuper() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/super.kt");
                 doTest(fileName);
             }
 
+            @TestMetadata("twoArgsContainsFromJava.kt")
+            public void testTwoArgsContainsFromJava() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/twoArgsContainsFromJava.kt");
+                doTest(fileName);
+            }
+
             @TestMetadata("typeArguments.kt")
             public void testTypeArguments() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceContains/typeArguments.kt");