diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AddAnnotationUseSiteTargetIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddAnnotationUseSiteTargetIntention.kt
index de4cbe40ec9..595849715a3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/AddAnnotationUseSiteTargetIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddAnnotationUseSiteTargetIntention.kt
@@ -141,6 +141,6 @@ private fun KtAnnotationEntry.applicableUseSiteTargets(): List<AnnotationUseSite
 
 private fun KtAnnotationEntry.addUseSiteTarget(useSiteTarget: AnnotationUseSiteTarget, project: Project) {
     project.executeWriteCommand("Add use-site target") {
-        replace(KtPsiFactory(this).createAnnotationEntry("@${useSiteTarget.renderName}:$shortName"))
+        replace(KtPsiFactory(this).createAnnotationEntry("@${useSiteTarget.renderName}:$shortName${valueArgumentList?.text ?: ""}"))
     }
 }
diff --git a/idea/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt b/idea/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt
new file mode 100644
index 00000000000..350e4b94c57
--- /dev/null
+++ b/idea/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt
@@ -0,0 +1,8 @@
+// CHOOSE_USE_SITE_TARGET: field
+
+annotation class A(val s: String)
+
+class Test {
+    @A("...")<caret>
+    val foo: String = ""
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt.after b/idea/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt.after
new file mode 100644
index 00000000000..5d7bca06efb
--- /dev/null
+++ b/idea/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt.after
@@ -0,0 +1,8 @@
+// CHOOSE_USE_SITE_TARGET: field
+
+annotation class A(val s: String)
+
+class Test {
+    @field:A("...")
+    val foo: String = ""
+}
\ 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 8328343bac0..d764ac70442 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -33,6 +33,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/addAnnotationUseSiteTarget"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
         }
 
+        @TestMetadata("hasAnnotationArgs.kt")
+        public void testHasAnnotationArgs() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addAnnotationUseSiteTarget/hasAnnotationArgs.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("hasTarget1.kt")
         public void testHasTarget1() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/addAnnotationUseSiteTarget/hasTarget1.kt");