diff --git a/idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java b/idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java
index 40dd0154b1f..548731ed7f5 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java
+++ b/idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java
@@ -54,7 +54,8 @@ public class JetPairMatcher implements PairedBraceMatcher {
                 || contextType == JetTokens.RPAR
                 || contextType == JetTokens.RBRACKET
                 || contextType == JetTokens.RBRACE
-                || contextType == JetTokens.LBRACE;
+                || contextType == JetTokens.LBRACE
+                || contextType == JetTokens.LONG_TEMPLATE_ENTRY_END;
     }
 
     @Override
diff --git a/idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.kt b/idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.kt
index 42d69297a78..0a1cd5680fb 100644
--- a/idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.kt
+++ b/idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.kt
@@ -222,6 +222,18 @@ public class TypedHandlerTest : LightCodeInsightTestCase() {
             "}"
     )
 
+    public fun testAutoInsertParenInStringLiteral(): Unit = doCharTypeTest(
+            '(',
+            """fun f() { println("$amp{f<caret>}") }""",
+            """fun f() { println("$amp{f(<caret>)}") }"""
+    )
+
+    public fun testAutoInsertParenInCode(): Unit = doCharTypeTest(
+            '(',
+            """fun f() { val a = f<caret> }""",
+            """fun f() { val a = f(<caret>) }"""
+    )
+
     public fun testTypeLtInFunDeclaration() {
         doLtGtTest("fun <caret>")
     }