diff --git a/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp b/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp
index af20a2ee84..326834f649 100644
--- a/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp
+++ b/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp
@@ -492,10 +492,10 @@ public:
                             break;
 
                         right += nextAtom->width;
-                    }
 
-                    if (SHOULD_WRAP (right, wordWrapWidth))
-                        return wrapCurrentAtom();
+                        if (atom != 0 && SHOULD_WRAP (right, wordWrapWidth))
+                            return wrapCurrentAtom();
+                    }
                 }
             }
         }