diff --git a/packages/edit/src/js/gridEdit.js b/packages/edit/src/js/gridEdit.js
index 5e4c20d81d..7d08337311 100644
--- a/packages/edit/src/js/gridEdit.js
+++ b/packages/edit/src/js/gridEdit.js
@@ -976,6 +976,9 @@
                     }
                   });
 
+                  if ($elm[0]) {
+                    $elm[0].focus();
+                  }
                   $elm.on('blur', $scope.stopEdit);
                 });