diff options
| -rw-r--r-- | client/src/com/vaadin/client/ui/grid/Grid.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/ui/grid/Grid.java b/client/src/com/vaadin/client/ui/grid/Grid.java index f280b26493..a32a31b029 100644 --- a/client/src/com/vaadin/client/ui/grid/Grid.java +++ b/client/src/com/vaadin/client/ui/grid/Grid.java @@ -1923,8 +1923,10 @@ public class Grid<T> extends Composite implements } } - if (activeCellHandler.getNavigationEvents().contains( - event.getType())) { + Collection<String> navigation = activeCellHandler + .getNavigationEvents(); + if (navigation.contains(event.getType()) + && (Util.getFocusedElement() == getElement() || cell != null)) { activeCellHandler.handleNavigationEvent(event, cell); } } |