diff --git a/spec/editor-component-spec.coffee b/spec/editor-component-spec.coffee
index 6c8e1b310..9e698eb8d 100644
--- a/spec/editor-component-spec.coffee
+++ b/spec/editor-component-spec.coffee
@@ -1075,7 +1075,7 @@ describe "EditorComponent", ->
       expect(inputNode.offsetTop).toBe 0
       expect(inputNode.offsetLeft).toBe 0
 
-  describe "mouse interactions on the scrollView", ->
+  describe "mouse interactions on the lines", ->
     linesNode = null
 
     beforeEach ->
@@ -1814,9 +1814,11 @@ describe "EditorComponent", ->
         wrapperView.show()
         expect(node.querySelector('.cursor').style['-webkit-transform']).toBe "translate3d(#{9 * charWidth}px, 0px, 0px)"
 
-  describe "when the editor component is resized", ->
-    it "updates the component based on a new size", ->
+  describe "soft wrapping", ->
+    beforeEach ->
       editor.setSoftWrap(true)
+
+    it "updates the wrap location when the editor is resized", ->
       newHeight = 4 * editor.getLineHeightInPixels() + "px"
       expect(newHeight).toBeLessThan node.style.height
       node.style.height = newHeight
@@ -1831,6 +1833,16 @@ describe "EditorComponent", ->
       runSetImmediateCallbacks()
       expect(node.querySelector('.line').textContent).toBe "var quicksort "
 
+    it "accounts for the scroll view's padding when determining the wrap location", ->
+      scrollViewNode = node.querySelector('.scroll-view')
+      scrollViewNode.style.paddingLeft = 20 + 'px'
+      node.style.width = 30 * charWidth + 'px'
+
+      advanceClock(component.scrollViewMeasurementInterval)
+      runSetImmediateCallbacks()
+
+      expect(component.lineNodeForScreenRow(0).textContent).toBe "var quicksort = "
+
   describe "default decorations", ->
     it "applies .cursor-line decorations for line numbers overlapping selections", ->
       editor.setCursorScreenPosition([4, 4])
diff --git a/src/editor-component.coffee b/src/editor-component.coffee
index 35e6ad58e..53a3b79c9 100644
--- a/src/editor-component.coffee
+++ b/src/editor-component.coffee
@@ -767,6 +767,8 @@ EditorComponent = React.createClass
 
     if position is 'absolute' or width
       clientWidth = scrollViewNode.clientWidth
+      paddingLeft = parseInt(getComputedStyle(scrollViewNode).paddingLeft)
+      clientWidth -= paddingLeft
       editor.setWidth(clientWidth) if clientWidth > 0
 
   measureLineHeightAndCharWidthsIfNeeded: (prevState) ->