diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 7a1abf49c6..314e14a05b 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -7305,7 +7305,7 @@ Editor::playhead_forward_to_grid ()
 
 		if (pos.sample < max_samplepos - 1) {
 			pos.sample += 2;
-			snap_to_internal (pos, RoundUpAlways, SnapToGrid_Scaled, true);
+			pos = snap_to_grid (pos, RoundUpAlways, SnapToGrid_Scaled);
 			_session->request_locate (pos.sample);
 		}
 	}
@@ -7338,14 +7338,14 @@ Editor::playhead_backward_to_grid ()
 
 		if (pos.sample > 2) {
 			pos.sample -= 2;
-			snap_to_internal (pos, RoundDownAlways, SnapToGrid_Scaled, true);
+			pos = snap_to_grid (pos, RoundDownAlways, SnapToGrid_Scaled);
 		}
 
 		//handle the case where we are rolling, and we're less than one-half second past the mark, we want to go to the prior mark...
 		//also see:  jump_backward_to_mark
 		if (_session->transport_rolling()) {
 			if ((playhead_cursor->current_sample() - pos.sample) < _session->sample_rate()/2) {
-				snap_to_internal (pos, RoundDownAlways, SnapToGrid_Scaled, true);
+				pos = snap_to_grid (pos, RoundDownAlways, SnapToGrid_Scaled);
 			}
 		}