diff --git a/sources/web/js/map-input-widget.js b/sources/web/js/map-input-widget.js
index ee7882f..23b8434 100644
--- a/sources/web/js/map-input-widget.js
+++ b/sources/web/js/map-input-widget.js
@@ -105,21 +105,23 @@ function MapInputWidget ( widget )
             }
         );
 
-        google.maps.event.addListener
-        (
-            map,
-            'click',
-            function ( click )
-            {
-                self.setPosition
-                (
-                    {
-                        latitude: click.latLng.lat(),
-                        longitude: click.latLng.lng(),
-                    }
-                );
-            }
-        );
+        if(isEditMode()){
+            google.maps.event.addListener
+            (
+                map,
+                'click',
+                function ( click )
+                {
+                    self.setPosition
+                    (
+                        {
+                            latitude: click.latLng.lat(),
+                            longitude: click.latLng.lng(),
+                        }
+                    );
+                }
+            );
+        }
 
     };
 
@@ -245,6 +247,12 @@ function MapInputWidget ( widget )
         return point;
     }
 
+    var isEditMode = function ()
+    {
+        var mode = $(widget).data('edit-mode');
+        return mode === 1;
+    };
+
     // Initializes widget
     this.initialize = function()
     {
@@ -301,7 +309,7 @@ function MapInputWidget ( widget )
             {
                 map: map,
                 position: point,
-                draggable: true,
+                draggable: isEditMode(),
                 animation: markerAnimation,
             }
         );
@@ -335,6 +343,17 @@ function MapInputWidget ( widget )
         map.setZoom(zoom);
     };
 
+    // Resize the map
+    this.resize = function()
+    {
+        google.maps.event.trigger(map, "resize");
+    };
+
+    // Gets the initial point
+    this.getInitialPoint = function ()
+    {
+        return getInitialValue();
+    };
 
 };
 
@@ -342,9 +361,7 @@ function MapInputWidget ( widget )
 // Use it to get references to widget instances.
 var mapInputWidgetManager;
 
-$(window).load
-(
-    function()
+$(window).on('load', function()
     {
 
         // Create an instance of widget manager
diff --git a/sources/web/js/map-input-widget.min.js b/sources/web/js/map-input-widget.min.js
index 96caec6..87a769e 100644
--- a/sources/web/js/map-input-widget.min.js
+++ b/sources/web/js/map-input-widget.min.js
@@ -1 +1 @@
-function MapInputWidgetManager(){const b=".kolyunya-map-input-widget";var a=this;var c=Array();var e=function(f){if(!$(f).data("initialized")){var g=new MapInputWidget(f);g.initialize();return g}return null};var d=function(g){var f=g.getId();c[f]=g};this.initializeWidgets=function(){$(b).each(function(f,g){var h=e(g);if(h){d(h)}})};this.getWidget=function(f){var g=c[f];return g}}function MapInputWidget(f){const p="input.kolyunya-map-input-widget-input";const b="input.kolyunya-map-input-widget-search-bar";const c="div.kolyunya-map-input-widget-canvas";var l=this;var j;var m;var d;var s;var r=function(){j=$(f).find(p).get(0);m=$(f).find(b).get(0);d=$(f).find(c).get(0)};var a=function(){s=new google.maps.Map(d,{mapTypeId:$(f).data("map-type"),center:q(),zoom:$(f).data("zoom"),styles:[{featureType:"poi",stylers:[{visibility:"off",},],},],mapTypeControlOptions:{mapTypeIds:[],},});google.maps.event.addListener(s,"click",function(u){l.setPosition({latitude:u.latLng.lat(),longitude:u.latLng.lng(),})})};var h=function(){var u=e();l.setPosition(u);$(f).data("initialized",true)};var t=function(){var u=$(f).data("enable-search-bar");var v=!u;$(m).prop("hidden",v);searchBarAutocomplete=new google.maps.places.Autocomplete(m);s.controls[google.maps.ControlPosition.TOP_LEFT].push(m);google.maps.event.addListener(searchBarAutocomplete,"place_changed",function(){var w=this.getPlace();var x=w.geometry;if(x){var y=x.location;l.setPosition(y)}})};var g=function(v){var w=i();var u=n(v);w=w.replace(/%latitude%/g,u.lat());w=w.replace(/%longitude%/g,u.lng());return w};var k=function(){var u=$(j).prop("value")!="";return u};var e=function(){var D;var z=i();var B=$(j).prop("value");if(B!==""){var x=z.indexOf("%latitude%");var A=z.indexOf("%longitude%");var v=x<A;var w=v?0:1;var y=v?1:0;var C=B.match(/-?\d+(\.\d+)?/g)[w];var u=B.match(/-?\d+(\.\d+)?/g)[y];D=new google.maps.LatLng(C,u)}else{D=null}return D};var o=function(){var w=$(f).data("latitude");var v=$(f).data("longitude");var u=new google.maps.LatLng(w,v);return u};var q=function(){var u;if(k()){u=e()}else{u=o()}return u};var i=function(){var u=$(f).data("pattern");return u};var n=function(v){var u;if(v.latitude!==undefined&&v.longitude!==undefined){var x=v.latitude;var w=v.longitude;u=new google.maps.LatLng(x,w)}else{u=v}return u};this.initialize=function(){r();a();h();t()};this.getId=function(){var u=$(f).prop("id");return u};this.setPosition=function(v){if(s.marker){s.marker.setMap(null)}if(v===null){$(j).prop("disabled",true);return}else{$(j).prop("disabled",false)}var u=n(v);if($(f).data("align-map-center")===1){s.panTo(u)}var x=null;if($(f).data("animate-marker")===1){x=google.maps.Animation.DROP}s.marker=new google.maps.Marker({map:s,position:u,draggable:true,animation:x,});google.maps.event.addListener(s.marker,"dragend",function(){l.setPosition(this.getPosition())});var w=$(f).data("pattern");var y=g(u);$(j).prop("value",y)};this.panTo=function(v){var u=n(v);s.panTo(u)};this.setZoom=function(u){s.setZoom(u)}}var mapInputWidgetManager;$(window).load(function(){mapInputWidgetManager=new MapInputWidgetManager();mapInputWidgetManager.initializeWidgets()});
\ No newline at end of file
+function MapInputWidgetManager(){const b=".kolyunya-map-input-widget";var a=this;var c=Array();var e=function(f){if(!$(f).data("initialized")){var g=new MapInputWidget(f);g.initialize();return g}return null};var d=function(g){var f=g.getId();c[f]=g};this.initializeWidgets=function(){$(b).each(function(f,g){var h=e(g);if(h){d(h)}})};this.getWidget=function(f){var g=c[f];return g}}function MapInputWidget(f){const p="input.kolyunya-map-input-widget-input";const b="input.kolyunya-map-input-widget-search-bar";const c="div.kolyunya-map-input-widget-canvas";var l=this;var j;var m;var d;var s;var r=function(){j=$(f).find(p).get(0);m=$(f).find(b).get(0);d=$(f).find(c).get(0)};var a=function(){s=new google.maps.Map(d,{mapTypeId:$(f).data("map-type"),center:q(),zoom:$(f).data("zoom"),styles:[{featureType:"poi",stylers:[{visibility:"off"}]}],mapTypeControlOptions:{mapTypeIds:[]}});google.maps.event.addListener(s,"click",function(u){l.setPosition({latitude:u.latLng.lat(),longitude:u.latLng.lng()})})};var h=function(){var u=e();l.setPosition(u);$(f).data("initialized",true)};var t=function(){var u=$(f).data("enable-search-bar");var v=!u;$(m).prop("hidden",v);searchBarAutocomplete=new google.maps.places.Autocomplete(m);s.controls[google.maps.ControlPosition.TOP_LEFT].push(m);google.maps.event.addListener(searchBarAutocomplete,"place_changed",function(){var w=this.getPlace();var x=w.geometry;if(x){var y=x.location;l.setPosition(y)}})};var g=function(v){var w=i();var u=n(v);w=w.replace(/%latitude%/g,u.lat());w=w.replace(/%longitude%/g,u.lng());return w};var k=function(){var u=$(j).prop("value")!="";return u};var e=function(){var D;var z=i();var B=$(j).prop("value");if(B!==""){var x=z.indexOf("%latitude%");var A=z.indexOf("%longitude%");var v=x<A;var w=v?0:1;var y=v?1:0;var C=B.match(/-?\d+(\.\d+)?/g)[w];var u=B.match(/-?\d+(\.\d+)?/g)[y];D=new google.maps.LatLng(C,u)}else{D=null}return D};var o=function(){var w=$(f).data("latitude");var v=$(f).data("longitude");var u=new google.maps.LatLng(w,v);return u};var q=function(){var u;if(k()){u=e()}else{u=o()}return u};var i=function(){var u=$(f).data("pattern");return u};var n=function(v){var u;if(v.latitude!==undefined&&v.longitude!==undefined){var x=v.latitude;var w=v.longitude;u=new google.maps.LatLng(x,w)}else{u=v}return u};this.initialize=function(){r();a();h();t()};this.getId=function(){var u=$(f).prop("id");return u};this.setPosition=function(v){if(s.marker){s.marker.setMap(null)}if(v===null){$(j).prop("disabled",true);return}else{$(j).prop("disabled",false)}var u=n(v);if($(f).data("align-map-center")===1){s.panTo(u)}var x=null;if($(f).data("animate-marker")===1){x=google.maps.Animation.DROP}s.marker=new google.maps.Marker({map:s,position:u,draggable:true,animation:x});google.maps.event.addListener(s.marker,"dragend",function(){l.setPosition(this.getPosition())});var w=$(f).data("pattern");var y=g(u);$(j).prop("value",y)};this.panTo=function(v){var u=n(v);s.panTo(u)};this.setZoom=function(u){s.setZoom(u)};this.resize=function(){google.maps.event.trigger(s,"resize")};this.getInitialPoint=function(){return e()}}var mapInputWidgetManager;$(window).on("load",function(){mapInputWidgetManager=new MapInputWidgetManager();mapInputWidgetManager.initializeWidgets()});
diff --git a/sources/widgets/MapInputWidget.php b/sources/widgets/MapInputWidget.php
index 09111f8..b051990 100644
--- a/sources/widgets/MapInputWidget.php
+++ b/sources/widgets/MapInputWidget.php
@@ -29,6 +29,8 @@ class MapInputWidget extends \yii\widgets\InputWidget
 
     public $enableSearchBar = true;
 
+    public $editMode = true;
+
     public function run()
     {
 
@@ -53,6 +55,7 @@ public function run()
                 'animateMarker' => $this->animateMarker,
                 'alignMapCenter' => $this->alignMapCenter,
                 'enableSearchBar' => $this->enableSearchBar,
+                'editMode' => $this->editMode
             ]
         );
     }
diff --git a/sources/widgets/views/MapInputWidget.php b/sources/widgets/views/MapInputWidget.php
index 8bab973..c9e6c6c 100644
--- a/sources/widgets/views/MapInputWidget.php
+++ b/sources/widgets/views/MapInputWidget.php
@@ -23,6 +23,7 @@
             'animate-marker' => $animateMarker,
             'align-map-center' => $alignMapCenter,
             'enable-search-bar' => $enableSearchBar,
+            'edit-mode' => $editMode
         ],
     ]
 );