diff --git a/ChangeLog b/ChangeLog
index b6aa1c341..93c15a6f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-17 Adrian Robert <arobert@cogsci.ucsd.edu>
+
+	* Source/NSWindow.m (-sendEvent:becomesKeyOnlyIfNeeded:): Give
+	mouseDragged events to _lastView rather than view (if exists)
+	underneath mouse.
+	
+
 2004-01-17 Adrian Robert <arobert@cogsci.ucsd.edu>
 
 	* Source/NSApplication.m
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 01732db65..b1f068f4e 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -3034,16 +3034,13 @@ resetCursorRectsForView(NSView *theView)
 	switch (type)
 	  {
 	    case NSLeftMouseDragged:
-	      v = [_wv hitTest: [theEvent locationInWindow]];
-	      [v mouseDragged: theEvent];
+              [_lastView mouseDragged: theEvent];
 	      break;
 	    case NSOtherMouseDragged:
-	      v = [_wv hitTest: [theEvent locationInWindow]];
-	      [v otherMouseDragged: theEvent];
+              [_lastView otherMouseDragged: theEvent];
 	      break;
 	    case NSRightMouseDragged:
-	      v = [_wv hitTest: [theEvent locationInWindow]];
-	      [v rightMouseDragged: theEvent];
+  	      [_lastView rightMouseDragged: theEvent];
 	      break;
 	    default:
 	      if (_f.accepts_mouse_moved)