diff --git a/components/lazmapviewer/source/mvmapviewer.pas b/components/lazmapviewer/source/mvmapviewer.pas
index c42c83bee..6080d814b 100644
--- a/components/lazmapviewer/source/mvmapviewer.pas
+++ b/components/lazmapviewer/source/mvmapviewer.pas
@@ -676,6 +676,7 @@ type
       function CreateLayers: TMapLayers; virtual;
       procedure UpdateLayers;
 
+      function CreateEditMark: TMapEditMark; virtual;
       procedure CreateEditor;
 
       function EditingEnabled: Boolean; inline;
@@ -4089,12 +4090,17 @@ begin
     FLayers[I].ComboLayer.TileLayer.ParentViewChanged;
 end;
 
+function TMapView.CreateEditMark: TMapEditMark;
+begin
+  Result := TMapEditMark.Create(self);
+end;
+
 procedure TMapView.CreateEditor;
 begin
   if Assigned(FEditMark) then
     Exit;
 
-  FEditMark := TMapEditMark.Create(Self);
+  FEditMark := CreateEditMark;
   FEditMark.UpdateFrom(Nil);
   FGPSItems[High(FGPSItems)].Add(FEditMark, _MAPEDITOR_ID_, MaxInt);
   FEditMark.Visible := True;
diff --git a/components/lazmapviewer/source/mvmapviewerpatheditform.pas b/components/lazmapviewer/source/mvmapviewerpatheditform.pas
index 68494b9ba..864a1c39d 100644
--- a/components/lazmapviewer/source/mvmapviewerpatheditform.pas
+++ b/components/lazmapviewer/source/mvmapviewerpatheditform.pas
@@ -295,8 +295,8 @@ var
   msg: String;
 begin
   msg := Format(
-    'Click OK to really add the new %0:s.' + LineEnding +
-    'Click Cancel to discard the new %0:s.', [
+    'Click on "OK" to add the new %s.' + LineEnding +
+    'Click on "Cancel" to discard it.', [
     TRACK_AREA[FEditMode = pemAddArea]
   ]);
   if MessageDlg(msg, mtConfirmation, [mbOK, mbCancel], 0) = mrOK then