diff --git a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/ASTUtils.java b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/ASTUtils.java
--- a/groovy.editor/src/org/netbeans/modules/groovy/editor/api/ASTUtils.java
+++ b/groovy.editor/src/org/netbeans/modules/groovy/editor/api/ASTUtils.java
@@ -473,13 +473,15 @@
                 TokenSequence<GroovyTokenId> ts = LexUtilities.getPositionedSequence(doc, startOffset);
                 if (ts != null) {
                     Token<GroovyTokenId> token = ts.token();
-                    if (token != null && token.id() == GroovyTokenId.IDENTIFIER && TokenUtilities.textEquals(identifier, token.text())) {
+                    if (token != null && token.id() == GroovyTokenId.IDENTIFIER 
+                            && ( TokenUtilities.textEquals(identifier, token.text())
+                                || TokenUtilities.endsWith(identifier, "." + token.text()) ) ) {
                         result[0] = computeRange(ts, token);
                         return;
                     }
                     while (ts.moveNext()) {
                         token = ts.token();
-                        if (token != null && token.id() == GroovyTokenId.IDENTIFIER && TokenUtilities.textEquals(identifier, token.text())) {
+                        if (token != null && token.id() == GroovyTokenId.IDENTIFIER && TokenUtilities.endsWith(identifier, token.text())) {
                             result[0] = computeRange(ts, token);
                             return;
                         }