diff --git a/src/editor.coffee b/src/editor.coffee
index 56c62d12d..5e0eb0b2a 100644
--- a/src/editor.coffee
+++ b/src/editor.coffee
@@ -1264,7 +1264,7 @@ class Editor extends Model
   addSelectionForBufferRange: (bufferRange, options={}) ->
     @markBufferRange(bufferRange, _.defaults(@getSelectionMarkerAttributes(), options))
     selection = @getLastSelection()
-    selection.autoscroll()
+    selection.autoscroll() if @manageScrollPosition
     selection
 
   # Public: Set the selected range in buffer coordinates. If there are multiple