diff --git a/geonode_mapstore_client/client/MapStore2 b/geonode_mapstore_client/client/MapStore2
index 25bb1a0aff..3d0f4ce492 160000
--- a/geonode_mapstore_client/client/MapStore2
+++ b/geonode_mapstore_client/client/MapStore2
@@ -1 +1 @@
-Subproject commit 25bb1a0aff5f295c2fa9b7b82e56b05261ec9998
+Subproject commit 3d0f4ce49281cfb98c841c399bae6d92816cd238
diff --git a/geonode_mapstore_client/static/mapstore/configs/localConfig.json b/geonode_mapstore_client/static/mapstore/configs/localConfig.json
index 80b65e358f..d033394cb6 100644
--- a/geonode_mapstore_client/static/mapstore/configs/localConfig.json
+++ b/geonode_mapstore_client/static/mapstore/configs/localConfig.json
@@ -1276,7 +1276,8 @@
                 "name": "FeatureEditor",
                 "cfg": {
                     "hideCloseButton": true,
-                    "hideLayerTitle": true
+                    "hideLayerTitle": true,
+                    "primaryKeyAttributes": ["fid"]
                 }
             },
             {
@@ -1920,7 +1921,10 @@
                 "name": "ScaleBox"
             },
             {
-                "name": "FeatureEditor"
+                "name": "FeatureEditor",
+                "cfg": {
+                    "primaryKeyAttributes": ["fid"]
+                }
             },
             {
                 "name": "QueryPanel",