diff --git a/source/com/intellij/codeInsight/editorActions/TypedHandler.java b/source/com/intellij/codeInsight/editorActions/TypedHandler.java
index 60d2e60dace0..d247c07f26c2 100644
--- a/source/com/intellij/codeInsight/editorActions/TypedHandler.java
+++ b/source/com/intellij/codeInsight/editorActions/TypedHandler.java
@@ -356,9 +356,12 @@ public class TypedHandler implements TypedActionHandler {
 
     // TODO: handle it with insertAfterLParen(...)
     if (!JspxCompletionData.isJavaContext(elementAt) &&
-        elementAt.getText().equals("${")
+        elementAt.getText().equals("{")
         ) {
-      editor.getDocument().insertString(offset, "}");
+      PsiElement prevSibling = elementAt.getPrevSibling();
+      if (prevSibling!=null && prevSibling.getText().equals("$")) {
+        editor.getDocument().insertString(offset, "}");
+      }
       return true;
     }