diff --git a/lib/OpenLayers/Control/LayerSwitcher.js b/lib/OpenLayers/Control/LayerSwitcher.js
index 005da67aeb..3ce422b8a9 100644
--- a/lib/OpenLayers/Control/LayerSwitcher.js
+++ b/lib/OpenLayers/Control/LayerSwitcher.js
@@ -115,6 +115,7 @@ OpenLayers.Control.LayerSwitcher.prototype =
     */
     doubleClick: function(evt) {
         Event.stop(evt);
+        return false;
     },
 
     /** 
@@ -144,6 +145,7 @@ OpenLayers.Control.LayerSwitcher.prototype =
         backdropLabel.layer = layer;
 
         // set event handlers
+        backdropLabelOuter.onclick = this.doubleClick.bindAsEventListener(this);
         backdropLabelOuter.ondblclick = this.doubleClick.bindAsEventListener(this);
         backdropLabelOuter.onmousedown = this.singleClick.bindAsEventListener(this);
 
diff --git a/lib/OpenLayers/Control/PanZoom.js b/lib/OpenLayers/Control/PanZoom.js
index e994ff354e..8ae460b94d 100644
--- a/lib/OpenLayers/Control/PanZoom.js
+++ b/lib/OpenLayers/Control/PanZoom.js
@@ -53,6 +53,7 @@ OpenLayers.Control.PanZoom.prototype =
 
         btn.onmousedown = this.buttonDown.bindAsEventListener(btn);
         btn.ondblclick  = this.doubleClick.bindAsEventListener(btn);
+        btn.onclick  = this.doubleClick.bindAsEventListener(btn);
         btn.action = id;
         btn.map = this.map;
 
@@ -63,6 +64,7 @@ OpenLayers.Control.PanZoom.prototype =
     
     doubleClick: function (evt) {
         Event.stop(evt);
+        return false;
     },
     
     buttonDown: function (evt) {
diff --git a/lib/OpenLayers/Control/PanZoomBar.js b/lib/OpenLayers/Control/PanZoomBar.js
index fa9b7e03a8..aa1f623c8a 100644
--- a/lib/OpenLayers/Control/PanZoomBar.js
+++ b/lib/OpenLayers/Control/PanZoomBar.js
@@ -68,6 +68,7 @@ OpenLayers.Control.PanZoomBar.prototype =
         this.sliderEvents.register("mousemove", this, this.zoomBarDrag);
         this.sliderEvents.register("mouseup", this, this.zoomBarUp);
         this.sliderEvents.register("dblclick", this, this.doubleClick);
+        this.sliderEvents.register("click", this, this.doubleClick);
         
         sz = new OpenLayers.Size();
         sz.h = this.zoomStopHeight*(this.map.getZoomLevels()+1);
@@ -96,6 +97,7 @@ OpenLayers.Control.PanZoomBar.prototype =
         this.divEvents.register("mousedown", this, this.divClick);
         this.divEvents.register("mousemove", this, this.passEventToSlider);
         this.divEvents.register("dblclick", this, this.doubleClick);
+        this.divEvents.register("click", this, this.doubleClick);
         
         this.div.appendChild(div);