diff --git a/ChangeLog b/ChangeLog
index 4d3236ceb..5286973d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-20  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/NSTextView.m (-writeSelectionToPasteboard:types:): Add
+	forgotten test to apply smart insert and delete during drag and
+	drop only when selection granularity is select by word.
+
 2010-02-18 17:21-EST Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSWindow.m: Remove private menu - (void) _menuUpdate, since 
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index 14cc33ce7..91aee573f 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -4776,7 +4776,8 @@ other than copy/paste or dragging. */
 			forType: NSRTFDPboardType] || ret;
 	}
 
-      if ([type isEqualToString: NSSmartPastePboardType])
+      if ([type isEqualToString: NSSmartPastePboardType] &&
+	  [self selectionGranularity] == NSSelectByWord)
 	{
 	  ret = [pboard setData: [NSData data]
 			forType: NSSmartPastePboardType] || ret;