diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyInsertHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyInsertHandler.java
index 33e608fd515f..21079ad200d5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyInsertHandler.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyInsertHandler.java
@@ -86,7 +86,8 @@ public class GroovyInsertHandler implements InsertHandler<LookupElement> {
       if (PsiTreeUtil.getParentOfType(elementAt, GrImportStatement.class) != null) return;
 
       if (parameters.length == 1) {
-        if (context.getCompletionChar() != '(' && TypesUtil.isClassType(parameters[0].getType(), GroovyCommonClassNames.GROOVY_LANG_CLOSURE)) {
+        if ((context.getCompletionChar() != '(' && context.getCompletionChar() != ' ') && 
+            TypesUtil.isClassType(parameters[0].getType(), GroovyCommonClassNames.GROOVY_LANG_CLOSURE)) {
           int afterBrace;
           final int nonWs = CharArrayUtil.shiftForward(document.getCharsSequence(), offset, " \t");
           if (nonWs < document.getTextLength() && document.getCharsSequence().charAt(nonWs) == '{') {
@@ -95,12 +96,7 @@ public class GroovyInsertHandler implements InsertHandler<LookupElement> {
             document.insertString(offset, " {}");
             afterBrace = offset + 2;
           }
-          if (context.getCompletionChar() == ' ') {
-            context.setAddCompletionChar(false);
-            caretModel.moveToOffset(offset + 1);
-          } else {
-            caretModel.moveToOffset(afterBrace);
-          }
+          caretModel.moveToOffset(afterBrace);
           return;
         }
       }
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy
index ae8f7686b559..9d2b20d90aaa 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GrCompletionWithLibraryTest.groovy
@@ -115,7 +115,7 @@ for (def ch: "abc".toCharArray()) {
   }
 
   public void testEachSpace() throws Exception {
-    checkCompletion '[].ea<caret>', ' ', '[].each <caret>{}'
+    checkCompletion '[].ea<caret>', ' ', '[].each <caret>'
   }
 
   public void testEachBrace() throws Exception {