diff --git a/ChangeLog b/ChangeLog
index 5de77d7ad..c4e32aca8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec 22 10:08:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSWindow.m: ([-sendEvent:]) reset _lastDragView on exit from
+	a view or on completion of dragging operation.  This ensures that if
+	you do two drags into the same view, the view gets two draggingEntered
+	messages (one for each session).
+
 Wed Dec 22  5:24:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/NSPanel.m: Fixed image display in alert panel.
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index c231c69b7..6da5decc3 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -2055,6 +2055,7 @@ resetCursorRectsForView(NSView *theView)
 				      @selector(draggingExited:), dragInfo,
 				      action);
 		}
+	      _lastDragView = nil;
 	      break;
 
 	    case GSAppKitDraggingDrop:
@@ -2077,6 +2078,7 @@ resetCursorRectsForView(NSView *theView)
 					  dragInfo);
 		    }
 		}
+	      _lastDragView = nil;
 	      e = [NSEvent otherEventWithType: NSAppKitDefined
 			   location: [theEvent locationInWindow]
 			   modifierFlags: 0
@@ -2090,6 +2092,7 @@ resetCursorRectsForView(NSView *theView)
 	      break;
 
 	    case GSAppKitDraggingFinished:
+	      _lastDragView = nil;
 	      NSLog(@"Internal: dropped GSAppKitDraggingFinished event\n");
 	      break;