diff --git a/lib/OpenLayers/Handler/Drag.js b/lib/OpenLayers/Handler/Drag.js
index b746fb047f..2cd6ccfe7c 100644
--- a/lib/OpenLayers/Handler/Drag.js
+++ b/lib/OpenLayers/Handler/Drag.js
@@ -200,8 +200,8 @@ OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, {
             
             if(!this.oldOnselectstart) {
                 this.oldOnselectstart = (document.onselectstart) ? document.onselectstart : OpenLayers.Function.True;
-                document.onselectstart = OpenLayers.Function.False;
             }
+            document.onselectstart = OpenLayers.Function.False;
             
             propagate = !this.stopDown;
         } else {
diff --git a/tests/Handler/Drag.html b/tests/Handler/Drag.html
index 4f93679cd3..581ffcca14 100644
--- a/tests/Handler/Drag.html
+++ b/tests/Handler/Drag.html
@@ -289,7 +289,7 @@
     }
 
     function test_Handler_Drag_submethods(t) {
-        t.plan(4);
+        t.plan(8);
         
         var map = new OpenLayers.Map('map', {controls: []});
 
@@ -300,6 +300,11 @@
         var handler = new OpenLayers.Handler.Drag(control, {});
         // set test events
         var events = ["down", "move", "up", "out"];
+        var onselect = {
+            "move": OpenLayers.Function.False,
+            "up": OpenLayers.Function.False,
+            "out": OpenLayers.Function.True
+        }
         var testEvents = {};
         var type, px;
         for(var i=0; i<events.length; ++i) {
@@ -313,10 +318,14 @@
                 t.ok(evt.xy.x == testEvents[type].xy.x &&
                      evt.xy.y == testEvents[type].xy.y,
                      "handler." + type + " called with the right event");
+                onselect[type] && t.ok(document.onselectstart === onselect[type], "document.onselectstart listener is correct after " + type);
             }
         }
         handler.activate();
         
+        // pretend that we have gone through a down-move-up-out cycle before
+        handler.oldOnselectstart = OpenLayers.Function.True;
+        
         // test mousedown
         handler.checkModifiers = function(evt) {
             return true;
@@ -343,6 +352,8 @@
         map.events.triggerEvent("mouseout", testEvents.out);
         OpenLayers.Util.mouseLeft = oldMouseLeft;
         
+        t.ok(document.onselectstart === OpenLayers.Function.True, "document.onselectstart listener correct after down-move-up-out cycle");
+        
     }
 
     function test_Handler_Drag_deactivate(t) {