diff --git a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp
index a4b76a0b8a..62ea1da872 100644
--- a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp
+++ b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp
@@ -70,6 +70,7 @@ AGGTextRenderer::AGGTextRenderer()
 	  fKerning(true),
 	  fEmbeddedTransformation(),
 
+	  fFont(),
 	  fLastFamilyAndStyle(0),
 	  fLastPointSize(-1.0),
 	  fLastHinted(false)
@@ -111,6 +112,7 @@ AGGTextRenderer::SetFont(const ServerFont &font)
 
 	fLastFamilyAndStyle = font.GetFamilyAndStyle();
 	fEmbeddedTransformation = transform;
+	fFont = font;
 
 	_UpdateSizeAndHinting(font.Size(), fEmbeddedTransformation.IsIdentity() && fHinted, load);
 
diff --git a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h
index b8aaa6c9f9..bfd100e593 100644
--- a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h
+++ b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h
@@ -80,6 +80,7 @@ class AGGTextRenderer {
 	Transformable				fEmbeddedTransformation;	// rotated or sheared font?
 
 	// caching to avoid loading a font unnecessarily
+	ServerFont					fFont;
 	uint32						fLastFamilyAndStyle;
 	float						fLastPointSize;
 	bool						fLastHinted;