diff --git a/src/tokenized-buffer.coffee b/src/tokenized-buffer.coffee
index 9c25e9cb3..f8bdabe58 100644
--- a/src/tokenized-buffer.coffee
+++ b/src/tokenized-buffer.coffee
@@ -446,7 +446,7 @@ class TokenizedBuffer extends Model
       0
 
   scopeDescriptorForPosition: (position) ->
-    {row, column} = Point.fromObject(position)
+    {row, column} = @buffer.clipPosition(Point.fromObject(position))
 
     iterator = @tokenizedLines[row].getTokenIterator()
     while iterator.next()