diff --git a/source/Ox.UI/js/Map/MapEditor.js b/source/Ox.UI/js/Map/MapEditor.js
index 6769eb98..323a473d 100644
--- a/source/Ox.UI/js/Map/MapEditor.js
+++ b/source/Ox.UI/js/Map/MapEditor.js
@@ -554,15 +554,17 @@ Ox.MapEditor = function(options, self) {
             change: function(data) {
                 var isResult = self.selectedPlace[0] == '_';
                 if (data.id == 'name') {
-                    !isResult && self.$list.value(self.selectedPlace, 'name', data.data.value);
+                    var name = data.data.value;
+                    !isResult && self.$list.value(self.selectedPlace, 'name', name);
+                    self.$placeName.options({title: name});
                     if (!self.isAsync) {
                         Ox.getObjectById(
                             self.options.places, self.selectedPlace
-                        ).name = data.data.value;
+                        ).name = name;
                     } else {
                         !isResult && editPlace(['name']);
                     }
-                    self.$map.value(self.selectedPlace, 'name', data.data.value);
+                    self.$map.value(self.selectedPlace, 'name', name);
                 } else if (data.id == 'alternativeNames') {
                     if (!self.isAsync) {
                         // ...
@@ -577,7 +579,6 @@ Ox.MapEditor = function(options, self) {
                     self.$placeFlag.attr({
                         src: Ox.getFlagByGeoname(geoname, 16)
                     });
-                    self.$placeName.options({title: geoname});
                     self.$placeForm.values({countryCode: countryCode});
                     if (!self.isAsync) {
                         if (!isResult) {