diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt
index efb3774be09..007dbb60d15 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt
@@ -17,13 +17,12 @@
 package org.jetbrains.kotlin.idea.intentions
 
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiRecursiveElementVisitor
-import org.jetbrains.kotlin.JetNodeTypes
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.expressionComparedToNull
-import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isNullExpression
 import org.jetbrains.kotlin.idea.util.isNothing
 import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.psi.*
@@ -32,14 +31,15 @@ import org.jetbrains.kotlin.psi.psiUtil.siblings
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 import java.util.ArrayList
 
-public class IfNullToElvisIntention : JetSelfTargetingOffsetIndependentIntention<JetIfExpression>(javaClass(), "Replace 'if' with elvis operator"){
-    override fun isApplicableTo(element: JetIfExpression): Boolean {
-        val data = calcData(element) ?: return false
+public class IfNullToElvisIntention : JetSelfTargetingRangeIntention<JetIfExpression>(javaClass(), "Replace 'if' with elvis operator"){
+    override fun applicabilityRange(element: JetIfExpression): TextRange? {
+        val data = calcData(element) ?: return null
 
-        val type = data.ifNullExpression.analyze().getType(data.ifNullExpression) ?: return false
-        if (!type.isNothing()) return false
+        val type = data.ifNullExpression.analyze().getType(data.ifNullExpression) ?: return null
+        if (!type.isNothing()) return null
 
-        return true
+        val rParen = element.getRightParenthesis() ?: return null
+        return TextRange(element.getTextRange().getStartOffset(), rParen.getTextRange().getEndOffset())
     }
 
     override fun applyTo(element: JetIfExpression, editor: Editor) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
index b5b07349524..4d6cd24d419 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt
@@ -142,7 +142,7 @@ public class J2kPostProcessor(private val formatCode: Boolean) : PostProcessor {
 
                     run {
                         val intention = IfNullToElvisIntention()
-                        if (intention.isApplicableTo(expression)) {
+                        if (intention.applicabilityRange(expression) != null) {
                             intention.applyTo(expression)
                             return
                         }