diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index efda94defc..3920d91607 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -2493,6 +2493,7 @@ private:
 	friend class MeterMarkerDrag;
 	friend class TempoMarkerDrag;
 	friend class TempoTwistDrag;
+	friend class TempoEndDrag;
 	friend class CursorDrag;
 	friend class FadeInDrag;
 	friend class FadeOutDrag;
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 899fd88fa3..6c21281f67 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3930,7 +3930,7 @@ TempoEndDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
 {
 	Drag::start_grab (event, cursor);
 
-	map = TempoMap::fetch_writable();
+	map = _editor->begin_tempo_map_edit ();
 
 	/* get current state */
 	_before_state = &map->get_state();
@@ -3994,7 +3994,7 @@ void
 TempoEndDrag::finished (GdkEvent* event, bool movement_occurred)
 {
 	if (!movement_occurred || !_drag_valid) {
-		TempoMap::abort_update ();
+		_editor->abort_tempo_map_edit ();
 		return;
 	}