diff --git a/gtk2_ardour/editing_context.cc b/gtk2_ardour/editing_context.cc
index 938a280f6e..fca26ee94a 100644
--- a/gtk2_ardour/editing_context.cc
+++ b/gtk2_ardour/editing_context.cc
@@ -122,12 +122,12 @@ EditingContext::EditingContext (std::string const & name)
 	, play_note_selection_button (_("Ear"), ArdourButton::Text, true)
 	, follow_playhead_button (_("F"), ArdourButton::Text, true)
 	, full_zoom_button (_("<->"), ArdourButton::Text)
+	, visible_channel_label (_("MIDI|Channel"))
 	, _drags (new DragManager (this))
 	, _leftmost_sample (0)
 	, _playhead_cursor (nullptr)
 	, _snapped_cursor (nullptr)
 	, _follow_playhead (false)
-	, visible_channel_label (_("MIDI|Channel"))
 	, selection (new Selection (this, true))
 	, cut_buffer (new Selection (this, false))
 	, _selection_memento (new SelectionMemento())
@@ -2099,7 +2099,7 @@ EditingContext::pop_canvas_cursor ()
 {
 	while (true) {
 		if (_cursor_stack.size() <= 1) {
-			PBD::error << "attempt to pop default cursor" << endmsg;
+			set_canvas_cursor (nullptr);
 			return;
 		}
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index f089beb7f4..a27cdfa94a 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -537,11 +537,8 @@ Editor::Editor ()
 
 	_group_tabs->signal_scroll_event().connect (sigc::mem_fun(*this, &Editor::control_layout_scroll), false);
 
-	_cursors = new MouseCursors;
-	_cursors->set_cursor_set (UIConfiguration::instance().get_icon_set());
-
 	/* Push default cursor to ever-present bottom of cursor stack. */
-	push_canvas_cursor(_cursors->grabber);
+	push_canvas_cursor (nullptr);
 
 	ArdourCanvas::GtkCanvas* time_pad = manage (new ArdourCanvas::GtkCanvas ());