diff --git a/projects/samskivert/src/java/com/samskivert/swing/dnd/DnDManager.java b/projects/samskivert/src/java/com/samskivert/swing/dnd/DnDManager.java
index 7531ade1..e94f2c16 100644
--- a/projects/samskivert/src/java/com/samskivert/swing/dnd/DnDManager.java
+++ b/projects/samskivert/src/java/com/samskivert/swing/dnd/DnDManager.java
@@ -119,6 +119,12 @@ public class DnDManager
      */
     protected void removeSource (JComponent comp)
     {
+        if (_sourceComp == comp) {
+            // reset cursors
+            clearComponentCursor();
+            _topComp.setCursor(_topCursor);
+            reset();
+        }
         _draggers.remove(comp);
         comp.removeMouseListener(_sourceListener);
         comp.removeMouseMotionListener(_sourceListener);