diff --git a/AppKit/CPTextView/CPTextView.j b/AppKit/CPTextView/CPTextView.j
index 39c4d83d0..73a14b494 100644
--- a/AppKit/CPTextView/CPTextView.j
+++ b/AppKit/CPTextView/CPTextView.j
@@ -2039,9 +2039,12 @@ var kDelegateRespondsTo_textShouldBeginEditing
 
         [self _deleteForRange:_selectionRange];
         [self setSelectedRange:_movingSelection];
-            
+
         var dataForPasting = [pasteboard stringForType:CPRTFPboardType];
-        [self insertText:[[_CPRTFParser new] parseRTF:dataForPasting]];
+        //  setTimeout is to a work around a transaction issue with the undomanager
+        setTimeout(function(){
+            [self insertText:[[_CPRTFParser new] parseRTF:dataForPasting]];
+        }, 0);
     }
         
     if ([pasteboard availableTypeFromArray:[CPColorDragType]])