diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index bf7072edce..13057dc3b2 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -982,8 +982,8 @@ Editor::set_canvas_cursor (Gdk::Cursor* cursor, bool save)
 
 	Glib::RefPtr<Gdk::Window> win = _track_canvas->get_window();
 
-	if (win) {
-	        _track_canvas->get_window()->set_cursor (*cursor);
+	if (win && cursor) {
+	        win->set_cursor (*cursor);
 	}
 }