diff --git a/modules/juce_graphics/fonts/juce_TextLayout.cpp b/modules/juce_graphics/fonts/juce_TextLayout.cpp
index ba369426fc..19abd3ff27 100644
--- a/modules/juce_graphics/fonts/juce_TextLayout.cpp
+++ b/modules/juce_graphics/fonts/juce_TextLayout.cpp
@@ -547,7 +547,7 @@ namespace TextLayoutHelpers
         {
             String trimmed (s.trimEnd());
             if (trimmed.isEmpty() && ! s.isEmpty())
-                trimmed = s;
+                trimmed = s.replaceCharacters ("\r\n\t", "   ");
 
             return trimmed;
         }