diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt
new file mode 100644
index 00000000000..59b788ffef3
--- /dev/null
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt
@@ -0,0 +1,4 @@
+// "Replace with safe (?.) call" "true"
+
+operator fun Int.plus(index: Int) = this
+fun fox(arg: Int?) = arg <caret>+ 42
diff --git a/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt.after b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt.after
new file mode 100644
index 00000000000..4ccf9d716ad
--- /dev/null
+++ b/idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt.after
@@ -0,0 +1,4 @@
+// "Replace with safe (?.) call" "true"
+
+operator fun Int.plus(index: Int) = this
+fun fox(arg: Int?) = arg?.plus(42)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index be05ab826eb..38123dea418 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -6077,6 +6077,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/nullables/unsafeInfixCall/unsafeInfixCall.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("unsafePlus.kt")
+            public void testUnsafePlus() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/nullables/unsafeInfixCall/unsafePlus.kt");
+                doTest(fileName);
+            }
         }
     }