diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index adb08e0fcc4..8f350014470 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -4652,6 +4652,18 @@ public void setEditorFieldFactory(FieldGroupFieldFactory fieldFactory) {
         editorFieldGroup.setFieldFactory(fieldFactory);
     }
 
+    /**
+     * Gets the field factory for the {@link FieldGroup}. The field factory is
+     * only used when {@link FieldGroup} creates a new field.
+     * <p>
+     * <em>Note:</em> This is a pass-through call to the backing field group.
+     * 
+     * @return The field factory in use
+     */
+    public FieldGroupFieldFactory getEditorFieldFactory() {
+        return editorFieldGroup.getFieldFactory();
+    }
+
     @Override
     public void addItemClickListener(ItemClickListener listener) {
         addListener(GridConstants.ITEM_CLICK_EVENT_ID, ItemClickEvent.class,