diff --git a/lib/OpenLayers/Renderer/Canvas.js b/lib/OpenLayers/Renderer/Canvas.js
index 35939afdd2..ee90db4e38 100644
--- a/lib/OpenLayers/Renderer/Canvas.js
+++ b/lib/OpenLayers/Renderer/Canvas.js
@@ -787,7 +787,8 @@ OpenLayers.Renderer.Canvas = OpenLayers.Class(OpenLayers.Renderer, {
      */
     getFeatureIdFromEvent: function(evt) {
         var featureId, feature;
-        if (this.hitDetection) {
+        
+        if (this.hitDetection && this.root.style.display !== "none") {
             // this dragging check should go in the feature handler
             if (!this.map.dragging) {
                 var xy = evt.xy;
diff --git a/tests/Renderer/Canvas.html b/tests/Renderer/Canvas.html
index bdec99948c..303b56732d 100644
--- a/tests/Renderer/Canvas.html
+++ b/tests/Renderer/Canvas.html
@@ -336,12 +336,18 @@
         }        
         
         var num = cases.length;
-        t.plan(num);
+        t.plan(2 * num);
         var c, feature;
         for (var i=0; i<num; ++i) {
             c = cases[i];
             feature = layer.renderer.getFeatureIdFromEvent({xy: px(c.x, c.y)});
             t.eq(feature && feature.id, c.id, c.msg);
+            
+            // Extra test: hit detection on an invisible canvas should return undefined
+            layer.setVisibility(false);
+            feature = layer.renderer.getFeatureIdFromEvent({xy: px(c.x, c.y)});
+            t.eq(feature, undefined, c.msg + ' (invisible)');
+            layer.setVisibility(true);
         }
         
         map.destroy();