diff --git a/src/app/display-buffer.coffee b/src/app/display-buffer.coffee
index bc5c4c10b..1a672072a 100644
--- a/src/app/display-buffer.coffee
+++ b/src/app/display-buffer.coffee
@@ -10,6 +10,8 @@ Token = require 'token'
 DisplayBufferMarker = require 'display-buffer-marker'
 Subscriber = require 'subscriber'
 
+DefaultSoftWrapColumn = 1000000
+
 module.exports =
 class DisplayBuffer
   screenLines: null
@@ -38,7 +40,7 @@ class DisplayBuffer
         deserializer: @constructor.name
         id: @id
         tokenizedBuffer: @tokenizedBuffer.getState()
-        softWrapColumn: softWrapColumn ? Infinity
+        softWrapColumn: softWrapColumn ? DefaultSoftWrapColumn
 
     @markers = {}
     @foldsByMarkerId = {}