diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinValueArgumentListFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinValueArgumentListFixer.kt
index 8355b973410..cdc814afe37 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinValueArgumentListFixer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinValueArgumentListFixer.kt
@@ -32,7 +32,7 @@ class KotlinValueArgumentListFixer : SmartEnterProcessorWithFixers.Fixer<KotlinS
                 editor.caretModel.moveToOffset(offset + 1)
             }
         } else {
-            val offset = element.endOffset
+            val offset = lastArgument?.endOffset ?: element.endOffset
             editor.document.insertString(offset, ")")
             editor.caretModel.moveToOffset(offset + 1)
         }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
index e0a80578f8d..cb9f14648d6 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt
@@ -1483,6 +1483,39 @@ class SmartEnterTest : KotlinLightCodeInsightFixtureTestCase() {
         """
     )
 
+    fun testValueArgumentList6() = doFileTest(
+        """
+        fun foo(s: String) = 1
+        fun test() {
+            foo(""<caret>
+            val aValue = ""
+        }
+        """,
+        """
+        fun foo(s: String) = 1
+        fun test() {
+            foo("")<caret>
+            val aValue = ""
+        }
+        """
+    )
+
+    fun testValueArgumentList7() = doFileTest(
+        """
+        fun test() {
+            String.to("123"<caret>
+            val aValue = ""
+        }
+        """,
+        """
+        fun test() {
+            String.to("123")
+            <caret>
+            val aValue = ""
+        }
+        """
+    )
+
     fun doFunTest(before: String, after: String) {
         fun String.withFunContext(): String {
             val bodyText = "//----\n${this.trimIndent()}\n//----"