diff --git a/gtk2_ardour/pianoroll.cc b/gtk2_ardour/pianoroll.cc
index 6f5ced2bb4..0ac2161f18 100644
--- a/gtk2_ardour/pianoroll.cc
+++ b/gtk2_ardour/pianoroll.cc
@@ -1445,9 +1445,6 @@ Pianoroll::build_cc_menu (ArdourWidgets::MetaButton* ccbtn)
 void
 Pianoroll::set_track (std::shared_ptr<ARDOUR::Track> track)
 {
-	if (_track == track) {
-		return;
-	}
 	EC_LOCAL_TEMPO_SCOPE;
 
 	CueEditor::set_track (track);
@@ -1456,6 +1453,10 @@ Pianoroll::set_track (std::shared_ptr<ARDOUR::Track> track)
 		view->set_track (std::dynamic_pointer_cast<MidiTrack> (track));
 	}
 
+	if (_track == track) {
+		return;
+	}
+
 	cc_dropdown1->menu().items().clear ();
 	cc_dropdown2->menu().items().clear ();
 	cc_dropdown3->menu().items().clear ();