diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 8778e0132f..b78a0a97bf 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -166,9 +166,9 @@ ARDOUR_UI::set_session (Session *s)
 		secondary_clock->set_session (s);
 		big_clock->set_session (s);
 		video_timeline->set_session (s);
-		rc_option_editor->set_session (s);
 	}
 
+	rc_option_editor->set_session (s);
 	roll_controllable->set_session (s);
 	stop_controllable->set_session (s);
 	goto_start_controllable->set_session (s);