diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index 2f95b8168..c0ba50bed 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -576,14 +576,20 @@ var _CPTextFieldSquareBezelColor = nil,
 #if PLATFORM(DOM)
     switch (aLineBreakMode)
     {
-        case CPLineBreakByTruncatingTail:   _DOMTextElement.style.textOverflow = "ellipsis";
-                                            _DOMTextElement.style.whiteSpace = "nowrap";
-                                            _DOMTextElement.style.overflow = "hidden";
+        case CPLineBreakByTruncatingTail:   _DOMTextElement.style.textOverflow  = "ellipsis";
+                                            _DOMTextElement.style.whiteSpace    = "nowrap";
+                                            _DOMTextElement.style.overflow      = "hidden";
+                                            _DOMTextElement.style.wordWrap      = "normal";                                                
                                             break;
                                             
-        case CPLineBreakByWordWrapping:     _DOMTextElement.style.whiteSpace = "normal";
-                                            _DOMTextElement.style.overflow = "hidden";
-                                            _DOMTextElement.style.textOverflow = "clip";
+        case CPLineBreakByWordWrapping:     _DOMTextElement.style.whiteSpace    = "pre";
+                                            _DOMTextElement.style.whiteSpace    = "-o-pre-wrap";
+                                            _DOMTextElement.style.whiteSpace    = "-pre-wrap";
+                                            _DOMTextElement.style.whiteSpace    = "-moz-pre-wrap";
+                                            _DOMTextElement.style.whiteSpace    = "pre-wrap";
+                                            _DOMTextElement.style.overflow      = "hidden";
+                                            _DOMTextElement.style.textOverflow  = "clip";
+                                            _DOMTextElement.style.wordWrap      = "break-word";
                                             break;
     }
 #endif