diff --git a/static/madmin/static/js/madmin.js b/static/madmin/static/js/madmin.js
index 1ca81f2b1..4a669781a 100644
--- a/static/madmin/static/js/madmin.js
+++ b/static/madmin/static/js/madmin.js
@@ -1774,11 +1774,24 @@ new Vue({
                 layer.setStyle({ opacity: 1.0 });
                 layer.pm.enable({ snappable: false, allowSelfIntersection: allowSelfIntersection });
 
+                let dragging = false
+
                 layer.on("pm:markerdragstart", function() {
+                    if (dragging) {
+                        // ignore multiple drag starts (left + right mouse buttons at the same time)
+                        return;
+                    }
+
+                    dragging = true;
                     mouseEventsIgnore.enableIgnore();
                 });
 
                 layer.on("pm:markerdragend", function() {
+                    if (!dragging) {
+                        return;
+                    }
+
+                    dragging = false;
                     mouseEventsIgnore.disableIgnore();
                 });
             }
diff --git a/static/madmin/templates/map.html b/static/madmin/templates/map.html
index 6e9b7e593..df81925cb 100644
--- a/static/madmin/templates/map.html
+++ b/static/madmin/templates/map.html
@@ -20,10 +20,10 @@
 <script src="static/js/leaflet-sidebar.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/Leaflet.EasyButton/2.4.0/easy-button.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js"></script>
-<script src="https://unpkg.com/@geoman-io/leaflet-geoman-free@2.7.0/dist/leaflet-geoman.min.js"></script>
-<script src="static/js/leaflet-event-forwarder.js?1599172474"></script>
+<script src="https://unpkg.com/@geoman-io/leaflet-geoman-free@2.9.0/dist/leaflet-geoman.min.js"></script>
+<script src="static/js/leaflet-event-forwarder.js?1617020349"></script>
 <script src="static/js/s2geometry.min.js"></script>
-<script src="static/js/madmin.js?1598819723"></script>
+<script src="static/js/madmin.js?1617020349"></script>
 {% endblock %}
 
 {% block content %}