diff --git a/lib/OpenLayers/Control/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js
index 0c4b0481f8..0b7e6bd1eb 100644
--- a/lib/OpenLayers/Control/MouseToolbar.js
+++ b/lib/OpenLayers/Control/MouseToolbar.js
@@ -64,6 +64,8 @@ OpenLayers.Control.MouseToolbar.prototype =
         
         btn.events = new OpenLayers.Events(this, btn, null, true);
         btn.events.register("mousedown", this, this.buttonClick); 
+        btn.events.register("dblclick", this, 
+                            OpenLayers.Util.safeStopPropagation); 
         btn.action = id;
         btn.title = title;
         btn.alt = title;