diff --git a/AppKit/CPTextView/CPTypesetter.j b/AppKit/CPTextView/CPTypesetter.j
index 4e1934a0d..b5844fd90 100644
--- a/AppKit/CPTextView/CPTypesetter.j
+++ b/AppKit/CPTextView/CPTypesetter.j
@@ -312,6 +312,7 @@ var CPSystemTypesetterFactory;
             case  ' ':
                 wrapRange = CPMakeRangeCopy(lineRange);
                 wrapWidth = rangeWidth;
+                wrapRange._height = _lineHeight;
                 break;
 
             default:
@@ -331,6 +332,7 @@ var CPSystemTypesetterFactory;
             {
                 lineRange = wrapRange;
                _lineWidth = wrapWidth;
+               _lineHeight = wrapRange._height;
             }
 
             isNewline = YES;