diff --git a/idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt b/idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt
index eaaf01bb6af..df240a94fa6 100644
--- a/idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt
+++ b/idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt
@@ -30,7 +30,10 @@ public class JoinBlockIntoSingleStatementHandler : JoinRawLinesHandlerDelegate {
         if (file !is JetFile) return -1
 
         if (start == 0) return -1
-        val brace = file.findElementAt(start - 1)!!
+        val c = document.getCharsSequence()[start]
+        val index = if (c == '\n') start - 1 else start
+
+        val brace = file.findElementAt(index)!!
         if (brace.getNode()!!.getElementType() != JetTokens.LBRACE) return -1
 
         val block = brace.getParent() as? JetBlockExpression ?: return -1
diff --git a/idea/testData/joinLines/removeBraces/If.kt b/idea/testData/joinLines/removeBraces/If.kt
index 40b24eb2a4f..157fbeb3871 100644
--- a/idea/testData/joinLines/removeBraces/If.kt
+++ b/idea/testData/joinLines/removeBraces/If.kt
@@ -1,5 +1,5 @@
 fun foo() {
-    <caret>if (a) {
+    if (a) { <caret>
         bar()
     }
 }
diff --git a/idea/testData/joinLines/removeBraces/WhenEntry.kt b/idea/testData/joinLines/removeBraces/WhenEntry.kt
index b843f1eec3b..44d1ccc8242 100644
--- a/idea/testData/joinLines/removeBraces/WhenEntry.kt
+++ b/idea/testData/joinLines/removeBraces/WhenEntry.kt
@@ -1,6 +1,6 @@
 fun foo(p: Int) {
     when (p) {
-        1 -> {<caret>
+        1 -> { <caret>
             println()
         }
     }