diff --git a/AppKit/CPTextView/CPLayoutManager.j b/AppKit/CPTextView/CPLayoutManager.j
index 5bde364d9..e53669aa6 100644
--- a/AppKit/CPTextView/CPLayoutManager.j
+++ b/AppKit/CPTextView/CPLayoutManager.j
@@ -436,8 +436,8 @@ _oncontextmenuhandler = function () { return false; };
 {
     var actualRange = CPMakeRange(CPNotFound,0);
 
-    [self invalidateLayoutForCharacterRange: invalidatedRange isSoft:NO actualCharacterRange:actualRange];
-    [self invalidateDisplayForGlyphRange: actualRange];
+    [self invalidateLayoutForCharacterRange:invalidatedRange isSoft:NO actualCharacterRange:actualRange];
+    [self invalidateDisplayForGlyphRange:actualRange];
     [self _validateLayoutAndGlyphs];
     [[self firstTextView] sizeToFit];
 }
diff --git a/AppKit/CPTextView/CPTextView.j b/AppKit/CPTextView/CPTextView.j
index c97476a60..9ffd170af 100644
--- a/AppKit/CPTextView/CPTextView.j
+++ b/AppKit/CPTextView/CPTextView.j
@@ -1652,7 +1652,7 @@ var kDelegateRespondsTo_textShouldBeginEditing
     else
         [_typingAttributes setObject:aColor forKey:CPForegroundColorAttributeName];
 
-    [_layoutManager textStorage:_textStorage edited:0 range:range changeInLength:0 invalidatedRange:CPMakeRangeCopy(range)];
+    [_layoutManager textStorage:_textStorage edited:0 range:CPMakeRangeCopy(range) changeInLength:0 invalidatedRange:CPMakeRangeCopy(range)];
 }
 
 - (void)underline:(id)sender
@@ -1676,6 +1676,8 @@ var kDelegateRespondsTo_textShouldBeginEditing
         else
             [_typingAttributes setObject:[CPNumber numberWithInt:1] forKey:CPUnderlineStyleAttributeName];
     }
+
+    [_layoutManager textStorage:_textStorage edited:0 range:CPMakeRangeCopy(_selectionRange) changeInLength:0 invalidatedRange:CPMakeRangeCopy(_selectionRange)];
 }
 
 - (CPSelectionAffinity)selectionAffinity