1 files changed, 8 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ComponentLocator.java b/client/src/com/vaadin/client/ComponentLocator.java
index 017383e695..6cdccc0ff0 100644
--- a/client/src/com/vaadin/client/ComponentLocator.java
+++ b/client/src/com/vaadin/client/ComponentLocator.java
@@ -269,6 +269,14 @@ public class ComponentLocator {
             if (part.startsWith("domChild[")) {
                 String childIndexString = part.substring("domChild[".length(),
                         part.length() - 1);
+
+                if (Util.findWidget(baseElement, null) instanceof VBoxLayout) {
+                    Element e = baseElement.getFirstChildElement().cast();
+                    if (e.getClassName().equals("v-expand")) {
+                        element = e;
+                    }
+                }
+
                 try {
                     int childIndex = Integer.parseInt(childIndexString);
                     element = DOM.getChild(element, childIndex);