diff --git a/module/dca/tl_leaflet_map.php b/module/dca/tl_leaflet_map.php
index 18d5928..352ae03 100644
--- a/module/dca/tl_leaflet_map.php
+++ b/module/dca/tl_leaflet_map.php
@@ -9,6 +9,8 @@
  *
  */
 
+\Controller::loadLanguageFile('leaflet');
+
 $GLOBALS['TL_DCA']['tl_leaflet_map'] = array
 (
     'config' => array(
diff --git a/module/dca/tl_leaflet_marker.php b/module/dca/tl_leaflet_marker.php
index cd68586..7efbdfa 100644
--- a/module/dca/tl_leaflet_marker.php
+++ b/module/dca/tl_leaflet_marker.php
@@ -11,7 +11,6 @@
 
 \Controller::loadLanguageFile('leaflet');
 
-
 $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
 (
     'config' => array(
diff --git a/module/languages/en/leaflet.php b/module/languages/en/leaflet.php
index 935d0ae..5ee5ca2 100644
--- a/module/languages/en/leaflet.php
+++ b/module/languages/en/leaflet.php
@@ -36,3 +36,6 @@ $GLOBALS['TL_LANG']['leaflet_vector']['circleMarker'][0]  = 'Circle marker';
 $GLOBALS['TL_LANG']['leaflet_vector']['circleMarker'][1]  = 'Circle marker with fixed pixel width. For more details read the <a href="http://leafletjs.com/reference.html#circlemarker" target="_blank">Leaflet documentation</a>.';
 $GLOBALS['TL_LANG']['leaflet_vector']['rectangle'][0]  = 'Rectangle';
 $GLOBALS['TL_LANG']['leaflet_vector']['rectangle'][1]  = 'Rectangle overlay. For more details read the <a href="http://leafletjs.com/reference.html#rectangle" target="_blank">Leaflet documentation</a>.';
+
+$GLOBALS['TL_LANG']['leaflet']['searchPosition'] = 'Search location';
+$GLOBALS['TL_LANG']['leaflet']['applyPosition']  = 'Apply position';
diff --git a/module/languages/en/tl_leaflet_map.php b/module/languages/en/tl_leaflet_map.php
index 1fc7744..9b06841 100644
--- a/module/languages/en/tl_leaflet_map.php
+++ b/module/languages/en/tl_leaflet_map.php
@@ -71,6 +71,3 @@ $GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues']['1'][0]      = 'Enable';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues']['1'][1]      = 'Enable zoom function.';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues']['center'][0] = 'Center';
 $GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues']['center'][1] = 'If passed \'center\', it will zoom to the center of the view regardless of where the mouse was.';
-
-$GLOBALS['TL_LANG']['tl_leaflet_map']['searchPosition'] = 'Search';
-$GLOBALS['TL_LANG']['tl_leaflet_map']['applyPosition']  = 'Apply position';
diff --git a/module/templates/be_leaflet_geocode.html5 b/module/templates/be_leaflet_geocode.html5
index d02c816..9b62205 100644
--- a/module/templates/be_leaflet_geocode.html5
+++ b/module/templates/be_leaflet_geocode.html5
@@ -12,7 +12,7 @@
     }).addTo(map);
     var geocoder = L.Control.geocoder({
         collapsed: false,
-        placeholder: '<?php echo $GLOBALS['TL_LANG']['tl_leaflet_map']['searchPosition']; ?>'
+        placeholder: '<?php echo $GLOBALS['TL_LANG']['leaflet']['searchPosition']; ?>'
     }).addTo(map);
 
     geocoder.markGeocode = function(result) {
@@ -21,7 +21,7 @@
         var element   = $('<?php echo $this->field; ?>');
 
         link.set('style', 'margin-left: 10px;');
-        link.appendText('<?php echo $GLOBALS['TL_LANG']['tl_leaflet_map']['applyPosition']; ?>');
+        link.appendText('<?php echo $GLOBALS['TL_LANG']['leaflet']['applyPosition']; ?>');
         link.addEvent('click', function(e) {
             e.stop();