diff options
| -rw-r--r-- | client/src/com/vaadin/client/ui/VScrollTable.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java index 8bdafb9073..479fffc741 100644 --- a/client/src/com/vaadin/client/ui/VScrollTable.java +++ b/client/src/com/vaadin/client/ui/VScrollTable.java @@ -8005,9 +8005,11 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * handler is still active. (#10464) */ Element focusedElement = WidgetUtil.getFocusedElement(); - if (Util.getConnectorForElement(client, getParent(), focusedElement) == this - && focusedElement != null - && focusedElement != scrollBodyPanel.getFocusElement()) { + if (focusedElement != null + && focusedElement != scrollBodyPanel.getFocusElement() + && Util.getConnectorForElement(client, getParent(), + focusedElement) == ConnectorMap.get(client) + .getConnector(this)) { /* * Steal focus back to the focus handler if it was moved to some * other part of the table. Avoid stealing focus in other cases. |