diff --git a/src/app/text-buffer.coffee b/src/app/text-buffer.coffee
index b2934d856..5c207f3cf 100644
--- a/src/app/text-buffer.coffee
+++ b/src/app/text-buffer.coffee
@@ -282,7 +282,7 @@ class TextBuffer
     new Point(lastRow, @lineLengthForRow(lastRow))
 
   characterIndexForPosition: (position) ->
-    @text.indexForPoint(position)
+    @text.indexForPoint(@clipPosition(position))
 
   positionForCharacterIndex: (index) ->
     @text.pointForIndex(index)