diff --git a/src/geocoder-element.js b/src/geocoder-element.js
index 0d04b8ee..10e21a5b 100644
--- a/src/geocoder-element.js
+++ b/src/geocoder-element.js
@@ -80,7 +80,8 @@
 			}, geocoderInput);
 
 			if (closeButton) {
-				L.DomEvent.addListener(closeButton, 'click', function() {
+				L.DomEvent.addListener(closeButton, 'click', function(e) {
+					L.DomEvent.stopPropagation(e);
 					this.fire('delete', { waypoint: this._waypoint });
 				}, this);
 			}
diff --git a/src/itinerary.js b/src/itinerary.js
index 65aee90f..83ea96ba 100644
--- a/src/itinerary.js
+++ b/src/itinerary.js
@@ -53,7 +53,7 @@
 			this._altContainer = this.createAlternativesContainer();
 			this._container.appendChild(this._altContainer);
 			L.DomEvent.disableClickPropagation(this._container);
-			L.DomEvent.addListener(this._container, 'mousewheel', function(e) {
+			L.DomEvent.addListener(this._container, 'mousewheel wheel', function(e) {
 				L.DomEvent.stopPropagation(e);
 			});