diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 0068a812c4..fb791379ad 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -385,11 +385,13 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll)
 			if (!_editor->autoscroll_active() || from_autoscroll) {
                 
                 bool first_move = (_move_threshold_passed != old_move_threshold_passed) ||
-                                   from_autoscroll;
+                                   (from_autoscroll && !_starting_point_passed);
                 
-				motion (event, first_move && !_starting_point_passed);
+				motion (event, first_move);
 				
-                _starting_point_passed = first_move;
+                if (first_move) {
+                    _starting_point_passed = true;
+                }
                 
 				_last_pointer_x = _drags->current_pointer_x ();
 				_last_pointer_y = current_pointer_y ();