diff --git a/spec/fake-lines-yardstick.coffee b/spec/fake-lines-yardstick.coffee
index da5f8327e..a2568b959 100644
--- a/spec/fake-lines-yardstick.coffee
+++ b/spec/fake-lines-yardstick.coffee
@@ -19,9 +19,8 @@ class FakeLinesYardstick
   setScopedCharacterWidth: (scopeNames, character, width) ->
     @getScopedCharacterWidths(scopeNames)[character] = width
 
-  pixelPositionForScreenPosition: (screenPosition, clip=true) ->
+  pixelPositionForScreenPosition: (screenPosition) ->
     screenPosition = Point.fromObject(screenPosition)
-    screenPosition = @model.clipScreenPosition(screenPosition) if clip
 
     targetRow = screenPosition.row
     targetColumn = screenPosition.column
diff --git a/spec/lines-yardstick-spec.coffee b/spec/lines-yardstick-spec.coffee
index 74f5fca6a..3520d6935 100644
--- a/spec/lines-yardstick-spec.coffee
+++ b/spec/lines-yardstick-spec.coffee
@@ -1,5 +1,6 @@
 LinesYardstick = require "../src/lines-yardstick"
 {toArray} = require 'underscore-plus'
+{Point} = require 'text-buffer'
 
 describe "LinesYardstick", ->
   [editor, mockLineNodesProvider, createdLineNodes, linesYardstick, buildLineNode] = []
@@ -62,12 +63,12 @@ describe "LinesYardstick", ->
       }
       """
 
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 0])).toEqual({left: 0, top: 0})
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 1])).toEqual({left: 7, top: 0})
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 5])).toEqual({left: 37.78125, top: 0})
-      expect(linesYardstick.pixelPositionForScreenPosition([1, 6])).toEqual({left: 43.171875, top: 14})
-      expect(linesYardstick.pixelPositionForScreenPosition([1, 9])).toEqual({left: 72.171875, top: 14})
-      expect(linesYardstick.pixelPositionForScreenPosition([2, Infinity])).toEqual({left: 287.859375, top: 28})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 0))).toEqual({left: 0, top: 0})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 1))).toEqual({left: 7, top: 0})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 5))).toEqual({left: 37.78125, top: 0})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(1, 6))).toEqual({left: 43.171875, top: 14})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(1, 9))).toEqual({left: 72.171875, top: 14})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(2, Infinity))).toEqual({left: 287.859375, top: 28})
 
     it "reuses already computed pixel positions unless it is invalidated", ->
       atom.styles.addStyleSheet """
@@ -77,9 +78,9 @@ describe "LinesYardstick", ->
       }
       """
 
-      expect(linesYardstick.pixelPositionForScreenPosition([1, 2])).toEqual({left: 19.203125, top: 14})
-      expect(linesYardstick.pixelPositionForScreenPosition([2, 6])).toEqual({left: 57.609375, top: 28})
-      expect(linesYardstick.pixelPositionForScreenPosition([5, 10])).toEqual({left: 95.609375, top: 70})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(1, 2))).toEqual({left: 19.203125, top: 14})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(2, 6))).toEqual({left: 57.609375, top: 28})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(5, 10))).toEqual({left: 95.609375, top: 70})
 
       atom.styles.addStyleSheet """
       * {
@@ -87,15 +88,15 @@ describe "LinesYardstick", ->
       }
       """
 
-      expect(linesYardstick.pixelPositionForScreenPosition([1, 2])).toEqual({left: 19.203125, top: 14})
-      expect(linesYardstick.pixelPositionForScreenPosition([2, 6])).toEqual({left: 57.609375, top: 28})
-      expect(linesYardstick.pixelPositionForScreenPosition([5, 10])).toEqual({left: 95.609375, top: 70})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(1, 2))).toEqual({left: 19.203125, top: 14})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(2, 6))).toEqual({left: 57.609375, top: 28})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(5, 10))).toEqual({left: 95.609375, top: 70})
 
       linesYardstick.invalidateCache()
 
-      expect(linesYardstick.pixelPositionForScreenPosition([1, 2])).toEqual({left: 24, top: 14})
-      expect(linesYardstick.pixelPositionForScreenPosition([2, 6])).toEqual({left: 72, top: 28})
-      expect(linesYardstick.pixelPositionForScreenPosition([5, 10])).toEqual({left: 120, top: 70})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(1, 2))).toEqual({left: 24, top: 14})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(2, 6))).toEqual({left: 72, top: 28})
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(5, 10))).toEqual({left: 120, top: 70})
 
     it "correctly handles RTL characters", ->
       atom.styles.addStyleSheet """
@@ -106,13 +107,13 @@ describe "LinesYardstick", ->
       """
 
       editor.setText("السلام عليكم")
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 0]).left).toBe 0
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 1]).left).toBe 8
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 2]).left).toBe 16
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 5]).left).toBe 33
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 7]).left).toBe 50
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 9]).left).toBe 67
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 11]).left).toBe 84
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 0)).left).toBe 0
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 1)).left).toBe 8
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 2)).left).toBe 16
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 5)).left).toBe 33
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 7)).left).toBe 50
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 9)).left).toBe 67
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 11)).left).toBe 84
 
     it "doesn't report a width greater than 0 when the character to measure is at the beginning of a text node", ->
       # This spec documents what seems to be a bug in Chromium, because we'd
@@ -137,9 +138,9 @@ describe "LinesYardstick", ->
 
       editor.setText(text)
 
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 35]).left).toBe 230.90625
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 36]).left).toBe 237.5
-      expect(linesYardstick.pixelPositionForScreenPosition([0, 37]).left).toBe 244.09375
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 35)).left).toBe 230.90625
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 36)).left).toBe 237.5
+      expect(linesYardstick.pixelPositionForScreenPosition(Point(0, 37)).left).toBe 244.09375
 
     describe "::screenPositionForPixelPosition(pixelPosition)", ->
       it "converts pixel positions to screen positions", ->
diff --git a/src/lines-yardstick.coffee b/src/lines-yardstick.coffee
index bd8219e81..9edbbe17a 100644
--- a/src/lines-yardstick.coffee
+++ b/src/lines-yardstick.coffee
@@ -77,10 +77,7 @@ class LinesYardstick
     else
       Point(row, column)
 
-  pixelPositionForScreenPosition: (screenPosition, clip=true) ->
-    screenPosition = Point.fromObject(screenPosition)
-    screenPosition = @model.clipScreenPosition(screenPosition) if clip
-
+  pixelPositionForScreenPosition: (screenPosition) ->
     targetRow = screenPosition.row
     targetColumn = screenPosition.column
 
diff --git a/src/text-editor-component.coffee b/src/text-editor-component.coffee
index 6a84c8dac..03644241b 100644
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
@@ -434,12 +434,15 @@ class TextEditorComponent
   getVisibleRowRange: ->
     @presenter.getVisibleRowRange()
 
-  pixelPositionForScreenPosition: (screenPosition, clip) ->
+  pixelPositionForScreenPosition: (screenPosition, clip=true) ->
+    screenPosition = Point.fromObject(screenPosition)
+    screenPosition = @editor.clipScreenPosition(screenPosition) if clip
+
     unless @presenter.isRowVisible(screenPosition.row)
       @presenter.setScreenRowsToMeasure([screenPosition.row])
       @updateSyncPreMeasurement()
 
-    pixelPosition = @linesYardstick.pixelPositionForScreenPosition(screenPosition, clip)
+    pixelPosition = @linesYardstick.pixelPositionForScreenPosition(screenPosition)
     @presenter.clearScreenRowsToMeasure()
     pixelPosition
 
diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee
index 1912f4c2e..6841cf70e 100644
--- a/src/text-editor-presenter.coffee
+++ b/src/text-editor-presenter.coffee
@@ -433,7 +433,7 @@ class TextEditorPresenter
       else
         screenPosition = decoration.getMarker().getHeadScreenPosition()
 
-      pixelPosition = @pixelPositionForScreenPosition(screenPosition, true)
+      pixelPosition = @pixelPositionForScreenPosition(screenPosition)
 
       top = pixelPosition.top + @lineHeight
       left = pixelPosition.left + @gutterWidth
@@ -649,8 +649,10 @@ class TextEditorPresenter
   updateHorizontalDimensions: ->
     if @baseCharacterWidth?
       oldContentWidth = @contentWidth
-      clip = @model.tokenizedLineForScreenRow(@model.getLongestScreenRow())?.isSoftWrapped()
-      @contentWidth = @pixelPositionForScreenPosition([@model.getLongestScreenRow(), @model.getMaxScreenLineLength()], clip).left
+      rightmostPosition = Point(@model.getLongestScreenRow(), @model.getMaxScreenLineLength())
+      if @model.tokenizedLineForScreenRow(rightmostPosition.row)?.isSoftWrapped()
+        rightmostPosition = @model.clipScreenPosition(rightmostPosition)
+      @contentWidth = @pixelPositionForScreenPosition(rightmostPosition).left
       @contentWidth += @scrollLeft
       @contentWidth += 1 unless @model.isSoftWrapped() # account for cursor width
 
@@ -966,9 +968,9 @@ class TextEditorPresenter
   hasPixelPositionRequirements: ->
     @lineHeight? and @baseCharacterWidth?
 
-  pixelPositionForScreenPosition: (screenPosition, clip=true) ->
+  pixelPositionForScreenPosition: (screenPosition) ->
     position =
-      @linesYardstick.pixelPositionForScreenPosition(screenPosition, clip, true)
+      @linesYardstick.pixelPositionForScreenPosition(screenPosition)
     position.top -= @getScrollTop()
     position.left -= @getScrollLeft()
 
@@ -987,14 +989,14 @@ class TextEditorPresenter
     lineHeight = @model.getLineHeightInPixels()
 
     if screenRange.end.row > screenRange.start.row
-      top = @linesYardstick.pixelPositionForScreenPosition(screenRange.start, true).top
+      top = @linesYardstick.pixelPositionForScreenPosition(screenRange.start).top
       left = 0
       height = (screenRange.end.row - screenRange.start.row + 1) * lineHeight
       width = @getScrollWidth()
     else
-      {top, left} = @linesYardstick.pixelPositionForScreenPosition(screenRange.start, false)
+      {top, left} = @linesYardstick.pixelPositionForScreenPosition(screenRange.start)
       height = lineHeight
-      width = @linesYardstick.pixelPositionForScreenPosition(screenRange.end, false).left - left
+      width = @linesYardstick.pixelPositionForScreenPosition(screenRange.end).left - left
 
     {top, left, width, height}
 
@@ -1139,8 +1141,8 @@ class TextEditorPresenter
 
   buildHighlightRegions: (screenRange) ->
     lineHeightInPixels = @lineHeight
-    startPixelPosition = @pixelPositionForScreenPosition(screenRange.start, false)
-    endPixelPosition = @pixelPositionForScreenPosition(screenRange.end, false)
+    startPixelPosition = @pixelPositionForScreenPosition(screenRange.start)
+    endPixelPosition = @pixelPositionForScreenPosition(screenRange.end)
     spannedRows = screenRange.end.row - screenRange.start.row + 1
 
     regions = []