diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 2eafb325882..c209cdfdff9 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1234,7 +1234,7 @@ class Export(http.Controller):
         info = {}
         fields = self.fields_get(model)
         if ".id" in export_fields:
-            fields['.id'] = fields.pop('id', {'string': 'ID'})
+            fields['.id'] = fields.get('id', {'string': 'ID'})
 
         # To make fields retrieval more efficient, fetch all sub-fields of a
         # given field at the same time. Because the order in the export list is
diff --git a/addons/web/static/src/js/widgets/data_export.js b/addons/web/static/src/js/widgets/data_export.js
index 14cdc4c5e3e..8b07fd1f632 100644
--- a/addons/web/static/src/js/widgets/data_export.js
+++ b/addons/web/static/src/js/widgets/data_export.js
@@ -394,6 +394,7 @@ var DataExport = Dialog.extend({
     },
     add_field: function(field_id, string) {
         var $field_list = this.$('.o_fields_list');
+        field_id = this.records[field_id].value || field_id;
         if($field_list.find("option[value='" + field_id + "']").length === 0) {
             $field_list.append(new Option(string, field_id));
         }