diff --git a/src/script/plugins/FeatureEditorGrid.js b/src/script/plugins/FeatureEditorGrid.js
index 7ce9def8..1c681adf 100644
--- a/src/script/plugins/FeatureEditorGrid.js
+++ b/src/script/plugins/FeatureEditorGrid.js
@@ -122,7 +122,13 @@ gxp.plugins.FeatureEditorGrid = Ext.extend(Ext.grid.PropertyGrid, {
                 if (annotations && annotations.label) {
                     this.propertyNames = this.propertyNames || {};
                     this.propertyNames[name] = annotations.label;
-                }
+                } else {
+					var label = r.get("label");
+					if (!Ext.isEmpty(label)) {
+						this.propertyNames = this.propertyNames || {};
+						this.propertyNames[name] = label;
+					}
+				}
                 var listeners;
                 if (typeof value == "string") {
                     var format;