diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp
index eb8f05bf3c..203e1f7a51 100644
--- a/src/common/stattextcmn.cpp
+++ b/src/common/stattextcmn.cpp
@@ -118,6 +118,13 @@ void wxTextWrapper::Wrap(wxWindow *win, const wxString& text, int widthMax)
             OnNewLine();
         }
 
+        // Is this a special case when wrapping is disabled?
+        if ( widthMax < 0 )
+        {
+            DoOutputLine(line);
+            continue;
+        }
+
         for ( bool newLine = false; !line.empty(); newLine = true )
         {
             if ( newLine )