diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js
index f6569415..e1013bc0 100644
--- a/src/c3nav/site/static/site/js/c3nav.js
+++ b/src/c3nav/site/static/site/js/c3nav.js
@@ -1487,7 +1487,10 @@ SquareGridControl = L.Control.extend({
     },
 
     toggleGrid: function(e) {
-        if(e) e.preventDefault();
+        if(e) {
+            e.preventDefault();
+            e.stopPropagation();
+        }
         if (c3nav._gridControl.gridActive) {
             c3nav._gridControl.hideGrid();
         } else {
@@ -1562,7 +1565,6 @@ L.SquareGridLayer = L.Layer.extend({
     },
 
     _updateGrid: function(map) {
-
         var mapSize = map.getSize(), coord = null, lastCoord = null, size;
         for(i=0;i<this.config.cols.length;i++) {
             coord = map.latLngToContainerPoint([0, this.config.cols[i]], map.getZoom()).x;