diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java
index ddacf2c18903..0cde75af230b 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java
@@ -522,7 +522,7 @@ public class PsiImplUtil {
     while (next != null) {
       final ASTNode node = next.getNode();
       final IElementType type = node.getElementType();
-      if (type == GroovyTokenTypes.mSEMI) {
+      if (type == GroovyTokenTypes.mSEMI || type == TokenType.WHITE_SPACE && !next.getText().contains("\n")) {
         final PsiElement nnext = next.getNextSibling();
         container.deleteChildRange(next, next);
         next = nnext;