diff --git a/doc/authors.txt b/doc/authors.txt
index f90671bc72..48dbe14177 100644
--- a/doc/authors.txt
+++ b/doc/authors.txt
@@ -6,5 +6,9 @@ Philip Lindsay
 John Frank
 Schuyler Erle
 
+Patch contributors
+------------------
+Corey Puffault
+
 OpenLayers is graciously supported by MetaCarta, Inc.
 <http://www.metacarta.com>.
diff --git a/lib/OpenLayers/Control/MouseDefaults.js b/lib/OpenLayers/Control/MouseDefaults.js
index 9ce026342c..3ae7edd5d4 100644
--- a/lib/OpenLayers/Control/MouseDefaults.js
+++ b/lib/OpenLayers/Control/MouseDefaults.js
@@ -22,6 +22,7 @@ OpenLayers.Control.MouseDefaults.prototype =
     },
 
     defaultClick: function (evt) {
+        if (!Event.isLeftClick(evt)) return;
         var notAfterDrag = !this.performedDrag;
         this.performedDrag = false;
         return notAfterDrag;
@@ -39,6 +40,7 @@ OpenLayers.Control.MouseDefaults.prototype =
     * @param {Event} evt
     */
     defaultMouseDown: function (evt) {
+        if (!Event.isLeftClick(evt)) return;
         this.mouseDragStart = evt.xy.copyOf();
         this.performedDrag  = false;
         if (evt.shiftKey) {
@@ -94,6 +96,7 @@ OpenLayers.Control.MouseDefaults.prototype =
     * @param {Event} evt
     */
     defaultMouseUp: function (evt) {
+        if (!Event.isLeftClick(evt)) return;
         if (this.zoomBox) {
             var start = this.map.getLonLatFromViewPortPx( this.mouseDragStart ); 
             var end = this.map.getLonLatFromViewPortPx( evt.xy );
diff --git a/lib/OpenLayers/Control/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js
index e5baeed032..28b78d606b 100644
--- a/lib/OpenLayers/Control/MouseToolbar.js
+++ b/lib/OpenLayers/Control/MouseToolbar.js
@@ -63,7 +63,7 @@ OpenLayers.Control.MouseToolbar.prototype =
         
         btn.events = new OpenLayers.Events(this, btn);
         btn.events.register("mousedown", this, this.buttonClick); 
-        btn.events.register("mouseup", this, this.stopAction); 
+        btn.events.register("mouseup", this, Event.stop);
         btn.action = id;
         btn.title = title;
         btn.alt = title;
@@ -74,11 +74,8 @@ OpenLayers.Control.MouseToolbar.prototype =
         return btn;
     },
 
-    stopAction: function(evt) {
-        Event.stop(evt);
-    },
-
     buttonClick: function(evt) {
+        if (!Event.isLeftClick(evt)) return;
         this.switchModeTo(evt.div.action);
         Event.stop(evt);
     },