Index: trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java	(revision 17632)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java	(revision 17633)
@@ -26,4 +26,5 @@
     private final transient List<List<String>> dataKeys;
     private final transient List<List<String>> dataValues;
+    private final transient List<String> dataLabels;
 
     /**
@@ -39,5 +40,7 @@
         dataKeys = new ArrayList<>();
         dataValues = new ArrayList<>();
+        dataLabels = new ArrayList<>();
         if (orig != null) {
+            int index = 0;
             for (Map<String, String> m : orig) {
                 List<String> keys = new ArrayList<>();
@@ -49,4 +52,6 @@
                 dataKeys.add(keys);
                 dataValues.add(values);
+                dataLabels.add(m.getOrDefault("name", tr("Entry {0}", index + 1)));
+                index++;
             }
         }
@@ -77,5 +82,5 @@
         @Override
         public String getElementAt(int index) {
-            return tr("Entry {0}", index+1);
+            return dataLabels.get(index);
         }