diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/JoinDeclarationAndAssignmentIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/JoinDeclarationAndAssignmentIntention.kt
index 8e926a0b2c2f..b0bef46bab3c 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/JoinDeclarationAndAssignmentIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/JoinDeclarationAndAssignmentIntention.kt
@@ -7,6 +7,7 @@ import com.intellij.openapi.editor.ScrollType
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReferenceService
+import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.descriptors.ClassConstructorDescriptor
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
@@ -95,14 +96,14 @@ class JoinDeclarationAndAssignmentIntention : SelfTargetingRangeIntention<KtProp
         val initializerBlock = grandParent as? KtAnonymousInitializer
         val secondaryConstructor = grandParent as? KtSecondaryConstructor
         val newProperty = if (!element.isLocal && (initializerBlock != null || secondaryConstructor != null)) {
-            assignment.delete()
-            if ((initializerBlock?.body as? KtBlockExpression)?.isEmpty() == true) initializerBlock.delete()
+            assignment.deleteWithPreviousWhitespace()
+            if ((initializerBlock?.body as? KtBlockExpression)?.isEmpty() == true) initializerBlock.deleteWithPreviousWhitespace()
             val secondaryConstructorBlock = secondaryConstructor?.bodyBlockExpression
-            if (secondaryConstructorBlock?.isEmpty() == true) secondaryConstructorBlock.delete()
+            if (secondaryConstructorBlock?.isEmpty() == true) secondaryConstructorBlock.deleteWithPreviousWhitespace()
             element
         } else {
             assignment.replaced(element).also {
-                element.delete()
+                element.deleteWithPreviousWhitespace()
             }
         }
         val newInitializer = newProperty.initializer!!
@@ -193,6 +194,11 @@ class JoinDeclarationAndAssignmentIntention : SelfTargetingRangeIntention<KtProp
     }
 }
 
+private fun KtElement.deleteWithPreviousWhitespace() {
+    val first = prevSibling as? PsiWhiteSpace ?: this
+    parent?.deleteChildRange(first, /* last = */ this)
+}
+
 private fun PsiElement.resolveAllReferences(): Sequence<PsiElement?> =
     PsiReferenceService.getService().getReferences(this, PsiReferenceService.Hints.NO_HINTS)
         .asSequence()
diff --git a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType.kt.after b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType.kt.after
index 3018f236a315..90f13d1137de 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType.kt.after
@@ -1,4 +1,3 @@
 class A {
     var a: String? = <caret>null
-
 }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType2.kt.after b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType2.kt.after
index 1da23b0d4dfe..f48faa51d291 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/cannotRemoveType2.kt.after
@@ -2,5 +2,4 @@
 
 class A {
     var a: List<String> = <caret>emptyList()
-
 }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/deleteInitBlock.kt.after b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/deleteInitBlock.kt.after
index 2418fe9faae9..d02aec215649 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/deleteInitBlock.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/deleteInitBlock.kt.after
@@ -1,4 +1,3 @@
 class A {
     var a<selection>: Int</selection><caret> = 1
-
 }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/qualifiedName.kt.after b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/qualifiedName.kt.after
index 094c475f1c0a..0790a9365fee 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/qualifiedName.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/qualifiedName.kt.after
@@ -1,5 +1,4 @@
 // IS_APPLICABLE: true
 object Foo {
     val prop: Boolean = true
-
 }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/qualifiedName2.kt.after b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/qualifiedName2.kt.after
index eb6cfacdaa1e..9cd4c9fe16fd 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/qualifiedName2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/qualifiedName2.kt.after
@@ -3,5 +3,4 @@ package pack
 
 object Foo {
     val prop: Boolean = true
-
-}
\ No newline at end of file
+}
diff --git a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/usedLocal3.kt.after b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/usedLocal3.kt.after
index 3a1d75860c26..22576150e2eb 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/usedLocal3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/usedLocal3.kt.after
@@ -1,5 +1,4 @@
 class Test(height: Int, width: Int) {
     private val size: Int = height * width
     private val data: Int = size
-
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/usedLocal4.kt.after b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/usedLocal4.kt.after
index 5c44654dfba7..63b224d1770d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/usedLocal4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/joinDeclarationAndAssignment/usedLocal4.kt.after
@@ -4,5 +4,4 @@ class Foo(size: Int)
 class Test(height: Int, width: Int) {
     private val size: Int = height * width
     private val data: Foo = Foo(size)
-
 }
\ No newline at end of file