diff --git a/src/cursor.coffee b/src/cursor.coffee
index 184e6ad43..74922ff51 100644
--- a/src/cursor.coffee
+++ b/src/cursor.coffee
@@ -630,7 +630,8 @@ class Cursor extends Model
     {row, column} = @getScreenPosition()
     new Range(new Point(row, column), new Point(row, column + 1))
 
-  autoscroll: (options) ->
+  autoscroll: (options = {}) ->
+    options.clip = false
     @editor.scrollToScreenRange(@getScreenRange(), options)
 
   getBeginningOfNextParagraphBufferPosition: ->
diff --git a/src/text-editor.coffee b/src/text-editor.coffee
index a12f78b16..ab019fb11 100644
--- a/src/text-editor.coffee
+++ b/src/text-editor.coffee
@@ -3485,7 +3485,7 @@ class TextEditor extends Model
     @getElement().scrollToBottom()
 
   scrollToScreenRange: (screenRange, options = {}) ->
-    screenRange = @clipScreenRange(screenRange)
+    screenRange = @clipScreenRange(screenRange) if options.clip isnt false
     scrollEvent = {screenRange, options}
     @component?.didRequestAutoscroll(scrollEvent)
     @emitter.emit "did-request-autoscroll", scrollEvent