diff --git a/lib/OpenLayers/Handler/Click.js b/lib/OpenLayers/Handler/Click.js
index 6c9ccd1551..e19319984f 100644
--- a/lib/OpenLayers/Handler/Click.js
+++ b/lib/OpenLayers/Handler/Click.js
@@ -285,6 +285,10 @@ OpenLayers.Handler.Click = OpenLayers.Class(OpenLayers.Handler, {
             window.clearTimeout(this.timerId);
             this.timerId = null;
         }
+        if(this.rightclickTimerId != null) {
+            window.clearTimeout(this.rightclickTimerId);
+            this.rightclickTimerId = null;
+        }
     },
     
     /**