diff --git a/PortabilityLayer/PLQDraw.cpp b/PortabilityLayer/PLQDraw.cpp
index aab3ead..cd5c07d 100644
--- a/PortabilityLayer/PLQDraw.cpp
+++ b/PortabilityLayer/PLQDraw.cpp
@@ -495,6 +495,11 @@ void DrawSurface::DrawStringWrap(const Point &point, const Rect &constrainRect,
 				if (character == '\r')
 					break;
 
+				const PortabilityLayer::RenderedGlyphMetrics *metrics = nullptr;
+				const void *glyphData = nullptr;
+				if (rfont->GetGlyph(chars[i], metrics, glyphData))
+					spanWidth += metrics->m_advanceX;
+
 				i++;
 			}
 			else