diff --git a/modules/controls/src/main/java/javafx/scene/control/TableCell.java b/modules/controls/src/main/java/javafx/scene/control/TableCell.java
--- a/modules/controls/src/main/java/javafx/scene/control/TableCell.java
+++ b/modules/controls/src/main/java/javafx/scene/control/TableCell.java
@@ -354,6 +354,8 @@
             TablePosition editingCell = table.getEditingCell();
             if (updateEditingIndex) table.edit(-1, null);
 
+            table.requestFocus();
+
             CellEditEvent editEvent = new CellEditEvent(
                 table,
                 editingCell,
diff --git a/modules/controls/src/main/java/javafx/scene/control/TreeTableCell.java b/modules/controls/src/main/java/javafx/scene/control/TreeTableCell.java
--- a/modules/controls/src/main/java/javafx/scene/control/TreeTableCell.java
+++ b/modules/controls/src/main/java/javafx/scene/control/TreeTableCell.java
@@ -354,6 +354,8 @@
             
             if (updateEditingIndex) table.edit(-1, null);
 
+            table.requestFocus();
+
             CellEditEvent<S,T> editEvent = new CellEditEvent<S,T>(
                 table,
                 editingCell,