diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index a6e4e0807f6b..ab2f935ec2ce 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -362,6 +362,7 @@
 
     <basicWordSelectionFilter implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyWordSelectionFilter"/>
     <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.GroovyTypeCastSelectioner"/>
     <extendWordSelectionHandler implementation="org.jetbrains.plugins.groovy.editor.selection.GroovyDocParamsSelectioner"/>
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyMembersWithDocSelectioner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyMembersWithDocSelectioner.java
new file mode 100644
index 000000000000..1412560ca378
--- /dev/null
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/selection/GroovyMembersWithDocSelectioner.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2000-2012 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.ExtendWordSelectionHandler;
+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.groovydoc.psi.api.GrDocComment;
+import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocCommentOwner;
+import org.jetbrains.plugins.groovy.lang.groovydoc.psi.impl.GrDocCommentUtil;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMember;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Max Medvedev
+ */
+public class GroovyMembersWithDocSelectioner implements ExtendWordSelectionHandler {
+  @Override
+  public boolean canSelect(PsiElement e) {
+    return e instanceof GrDocComment || e instanceof GrMember;
+  }
+
+  @Override
+  public List<TextRange> select(PsiElement e, CharSequence editorText, int cursorOffset, Editor editor) {
+    final GrDocCommentOwner owner;
+    final GrDocComment doc;
+    if (e instanceof GrDocComment) {
+      doc = (GrDocComment)e;
+      owner = GrDocCommentUtil.findDocOwner(doc);
+    }
+    else {
+      owner = (GrDocCommentOwner)e;
+      doc = GrDocCommentUtil.findDocComment(owner);
+    }
+
+    if (doc == null || owner == null) return Collections.emptyList();
+
+    final TextRange range = new TextRange(doc.getTextRange().getStartOffset(), owner.getTextRange().getEndOffset());
+    return ExtendWordSelectionHandlerBase.expandToWholeLine(editorText, range, true);
+  }
+}
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyActionsTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyActionsTest.groovy
index 277c9324e357..dff034d87443 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyActionsTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/GroovyActionsTest.groovy
@@ -117,6 +117,28 @@ this.allOptions = [:];
 ''')
   }
 
+  void testSWforMemberWithDoc() {
+    doTestForSelectWord(4, '''\
+class A {
+  /**
+   * abc
+   */
+  def fo<caret>o() {}
+
+  def bar(){}
+}
+''', '''\
+class A {
+<selection>  /**
+   * abc
+   */
+  def fo<caret>o() {}
+</selection>
+  def bar(){}
+}
+''')
+  }
+
   private void doTestForSelectWord(int count, String input, String expected) {
     myFixture.configureByText("a.groovy", input);
     selectWord(count)