diff --git a/AppKit/CPTextView/CPTypesetter.j b/AppKit/CPTextView/CPTypesetter.j
index b9e6ac6d6..3e498cbc4 100644
--- a/AppKit/CPTextView/CPTypesetter.j
+++ b/AppKit/CPTextView/CPTypesetter.j
@@ -510,6 +510,16 @@ var _CPTypesetterDecimalSeparator = function()
                 if (viewSize.height > _lineHeight)
                     _lineHeight = viewSize.height - descent + leading;
 
+                // An attachment wider than the container stays on the line it overflows, so a break
+                // there keeps the line's height and baseline with the attachment's size applied.
+                // Otherwise the attachment would be placed on the baseline of the text before it,
+                // and drawn above its line.
+                if (CPMaxRange(wrapRange) === CPMaxRange(lineRange))
+                {
+                    wrapRange._height = _lineHeight;
+                    wrapRange._base = _lineBase;
+                }
+
                 ascent = viewSize.height;
                 break;
             }
diff --git a/Tests/Manual/TextEditor/WORKLIST.md b/Tests/Manual/TextEditor/WORKLIST.md
index d9e2ac21d..3c82b4630 100644
--- a/Tests/Manual/TextEditor/WORKLIST.md
+++ b/Tests/Manual/TextEditor/WORKLIST.md
@@ -91,4 +91,5 @@ How the text system works, for the entries below: `CPTextView` does not use CSS
 - Copy and paste within TextEditor with Command-C and Command-V, in one document and between documents: images, tables, including text edited in their cells, and lists are kept.
 - Table cells can be edited, as a first pass.
 - Pasting text with several images and a table: the table appears in place at once, and tables, images and text below a change move with their lines.
+- A table wider than the text stays on its own line below the text before it when the window is narrowed, and is clipped at the right edge, without a horizontal scroll bar, as in Cocoa when text wraps to the window.
 - Builds with both the legacy toolchain and capp-build.