diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 19f89a07935..81ff9c153e1 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -1289,13 +1289,14 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
     if(!graphics || !string || !font || !brush || !rect)
         return InvalidParameter;
 
-    if(format || (brush->bt != BrushTypeSolidColor)){
+    if((brush->bt != BrushTypeSolidColor)){
         FIXME("not implemented for given parameters\n");
-        if(format)
-            TRACE("format attr is %d\n", format->attr);
         return NotImplemented;
     }
 
+    if(format)
+        TRACE("may be ignoring some format flags: attr %x\n", format->attr);
+
     if(length == -1) length = lstrlenW(string);
 
     stringdup = GdipAlloc(length * sizeof(WCHAR));
@@ -1402,6 +1403,10 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
 
         if(height > roundr(rect->Height * rel_height))
             break;
+
+        /* Stop if this was a linewrap (but not if it was a linebreak). */
+        if((lret == fitcpy) && format && (format->attr & StringFormatFlagsNoWrap))
+            break;
     }
 
     DeleteObject(rgn);