diff --git a/src/juce_appframework/gui/graphics/fonts/juce_Typeface.cpp b/src/juce_appframework/gui/graphics/fonts/juce_Typeface.cpp
index da3f5dc0fe..2e3a81b059 100644
--- a/src/juce_appframework/gui/graphics/fonts/juce_Typeface.cpp
+++ b/src/juce_appframework/gui/graphics/fonts/juce_Typeface.cpp
@@ -302,7 +302,16 @@ const TypefaceGlyphInfo* Typeface::getGlyph (const juce_wchar character) throw()
 
     if (CharacterFunctions::isWhitespace (character) && character != L' ')
     {
-        return getGlyph (L' ');
+        const TypefaceGlyphInfo* spaceGlyph = getGlyph (L' ');
+
+        if (spaceGlyph != 0)
+        {
+            // Add a copy of the empty glyph, mapped onto this character
+            addGlyph (character, spaceGlyph->getPath(), spaceGlyph->getHorizontalSpacing (0));
+            spaceGlyph = (const TypefaceGlyphInfo*) glyphs [(int) lookupTable [character]];
+        }
+
+        return spaceGlyph;
     }
     else if (character != defaultCharacter)
     {