diff --git a/Control.Geocoder.js b/Control.Geocoder.js
index 30340e2..7f74514 100644
--- a/Control.Geocoder.js
+++ b/Control.Geocoder.js
@@ -340,7 +340,7 @@
         },
 
         geocode: function(query, cb, context) {
-            L.Control.Geocoder.jsonp(this.options.serviceUrl + 'search/', L.extend({
+            L.Control.Geocoder.jsonp(this.options.serviceUrl + 'search', L.extend({
                 q: query,
                 limit: 5,
                 format: 'json',
@@ -367,7 +367,7 @@
         },
 
         reverse: function(location, scale, cb, context) {
-            L.Control.Geocoder.jsonp(this.options.serviceUrl + 'reverse/', L.extend({
+            L.Control.Geocoder.jsonp(this.options.serviceUrl + 'reverse', L.extend({
                 lat: location.lat,
                 lon: location.lng,
                 zoom: Math.round(Math.log(scale / 256) / Math.log(2)),
diff --git a/InputfieldLeafletMapMarker.js b/InputfieldLeafletMapMarker.js
index b3df1ec..3461aee 100644
--- a/InputfieldLeafletMapMarker.js
+++ b/InputfieldLeafletMapMarker.js
@@ -133,6 +133,11 @@ var InputfieldLeafletMapMarker = {
                 map.invalidateSize();
             }, 200);
         });
+
+        if ($('div.InputfieldLeafletMapMarkerMap').hasClass('scrollwheel-disabled')){
+            map.scrollWheelZoom.disable()
+        }
+
     }
 };
 
diff --git a/InputfieldLeafletMapMarker.module b/InputfieldLeafletMapMarker.module
index f01a059..bb03c43 100644
--- a/InputfieldLeafletMapMarker.module
+++ b/InputfieldLeafletMapMarker.module
@@ -41,6 +41,7 @@ class InputfieldLeafletMapMarker extends Inputfield {
         require_once(dirname(__FILE__) . '/LeafletMapMarker.php');
         $this->set('defaultAddr', self::defaultAddr);
         $this->set('defaultZoom', 12);
+        $this->set('scrollWheelZoom', false);
         $this->set('defaultLat', '');
         $this->set('defaultLng', '');
         $this->set('height', 500);
@@ -108,6 +109,7 @@ class InputfieldLeafletMapMarker extends Inputfield {
         $mapType = $this->defaultType;
         $provider = $this->defaultProvider;
         $height = $this->height ? (int) $this->height : 300;
+        $scrollWheelZoom = $this->scrollWheelZoom;
 
         $labels = array(
             'addr' => $this->_('Address'),
@@ -154,7 +156,9 @@ class InputfieldLeafletMapMarker extends Inputfield {
 
 _OUT;
 
-        $out .= "<div class='InputfieldLeafletMapMarkerMap' " .
+        ($this->scrollWheelZoom == true) ? $class = ' scrollwheel-disabled' : $class = '';
+
+        $out .= "<div class='InputfieldLeafletMapMarkerMap{$class}' " .
             "id='_{$id}_map' " .
             "style='height: {$height}px' " .
             "data-lat='$marker->lat' " .
@@ -293,6 +297,15 @@ _OUT;
         $field->attr('type', 'number');
         $inputfields->add($field);
 
+        $field = $this->modules->get('InputfieldCheckbox');
+        $field->attr('name', 'scrollWheelZoom');
+        $field->label = $this->_('Scrollwheel Zoom Disable');
+        $field->label2 = $this->_('Check this to lock Scrollwheel Zoom ad prevent unwanted zoom in admin page edit');
+        $field->description = $this->_('Lock zoom by mouse wheel scroll');  // Zoom level description
+        $field->attr('value', $this->scrollWheelZoom ? $this->scrollWheelZoom : 0 );
+        $field->attr('checked', $this->scrollWheelZoom === 1 ? 'checked' : '' );
+        $inputfields->add($field);
+
         $field = $this->modules->get('InputfieldSelect');
         $field->attr('name', 'defaultProvider');
         $field->label = $this->_('Default Map Tile Provider');