diff --git a/modules/contribs/leaflet/leaflet.drupal.js b/modules/contribs/leaflet/leaflet.drupal.js
index 13f9d8c..4bf73f0 100644
--- a/modules/contribs/leaflet/leaflet.drupal.js
+++ b/modules/contribs/leaflet/leaflet.drupal.js
@@ -4,8 +4,17 @@
     attach:function (context, settings) {
 
       $(settings.leaflet).each(function () {
+        // Quick fix for the issue when other DOM elements fire AJAX events.
+        // The culprit is that 'leaflet-map' id will become 'leaflet-map--2'
+        // hence, it will make the 'container' object
+        // to become 'null' eventually since it could not find the new map id.
+        if (this.mapId != 'leaflet-map') {
+          this.mapId = "leaflet-map";
+        }
+
         // bail if the map already exists
         var container = L.DomUtil.get(this.mapId);
+
         if (container._leaflet) {
           return false;
         }