diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index ee4e9be77..b2b00f009 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -51,7 +51,11 @@ class DisplayBuffer extends Model
       @grammarRegistry, @packageManager, @assert
     })
     @buffer = @tokenizedBuffer.buffer
-    @displayLayer = @buffer.addDisplayLayer({tabLength: @getTabLength(), invisibles: @config.get('editor.invisibles'), showIndentGuides: @config.get('editor.showIndentGuide')})
+    @displayLayer = @buffer.addDisplayLayer({
+      tabLength: @getTabLength(), invisibles: @config.get('editor.invisibles'),
+      showIndentGuides: @config.get('editor.showIndentGuide'),
+      softWrapColumn: @config.get('editor.preferredLineLength')
+    })
     @displayLayer.setTextDecorationLayer(@tokenizedBuffer)
     @charWidthsByScope = {}
     @defaultMarkerLayer = @displayLayer.addMarkerLayer()