diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index b09ae2ef70b3..2a1d2767e6e9 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -431,6 +431,7 @@
     <extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyLiteralSelectioner"/>
     <extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyMembersWithDocSelectioner"/>
     <extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyBlockStatementsSelectioner"/>
+    <extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyTypeDefinitionBodySelectioner"/>
     <extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyTypeCastSelectioner"/>
     <extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyDocParamsSelectioner"/>
     <extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyArgListSelectioner"/>
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeDefinitionBodySelectioner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeDefinitionBodySelectioner.java
new file mode 100644
index 000000000000..31256065a07f
--- /dev/null
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyTypeDefinitionBodySelectioner.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.groovy.editor.selection;
+
+import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.PsiElement;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinitionBody;
+import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
+
+import java.util.List;
+
+/**
+ * Created by Max Medvedev on 8/19/13
+ */
+public class GroovyTypeDefinitionBodySelectioner extends ExtendWordSelectionHandlerBase {
+  public boolean canSelect(PsiElement e) {
+    return e instanceof GrTypeDefinitionBody;
+  }
+
+  public List<TextRange> select(PsiElement e, CharSequence editorText, int cursorOffset, Editor editor) {
+    List<TextRange> result = super.select(e, editorText, cursorOffset, editor);
+
+    if (e instanceof GrTypeDefinitionBody) {
+      GrTypeDefinitionBody block = ((GrTypeDefinitionBody)e);
+      int startOffset = findOpeningBrace(block);
+      int endOffset = findClosingBrace(block, startOffset);
+      TextRange range = new TextRange(startOffset, endOffset);
+      result.addAll(expandToWholeLine(editorText, range));
+    }
+    return result;
+  }
+
+  private static int findOpeningBrace(GrTypeDefinitionBody block) {
+    PsiElement lbrace = block.getLBrace();
+    if (lbrace == null) return block.getTextRange().getStartOffset();
+
+    while (PsiImplUtil.isWhiteSpace(lbrace.getNextSibling())) {
+      lbrace = lbrace.getNextSibling();
+    }
+    return lbrace.getTextRange().getEndOffset();
+  }
+
+  private static int findClosingBrace(GrTypeDefinitionBody block, int startOffset) {
+    PsiElement rbrace = block.getRBrace();
+    if (rbrace == null) return block.getTextRange().getEndOffset();
+
+    while (PsiImplUtil.isWhiteSpace(rbrace.getPrevSibling()) && rbrace.getPrevSibling().getTextRange().getStartOffset() > startOffset) {
+      rbrace = rbrace.getPrevSibling();
+    }
+
+    return rbrace.getTextRange().getStartOffset();
+  }
+}