diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 4e57fc0c1e..70daa60cc7 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -3175,6 +3175,8 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
 		return -1;
 	}
     
+    _session->config.ParameterChanged.connect_same_thread (connection_with_session_config, boost::bind (&ARDOUR_UI::on_parameter_changed, this, _1));
+    
     new_session->config.set_native_file_header_format(this->_header_format);
     new_session->config.set_native_file_data_format  (this->_sample_format);
     new_session->config.set_timecode_format(this->_timecode_format);
@@ -3199,10 +3201,7 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
 	}
 
 	set_session (new_session);
-
-	session_loaded = true;
-    
-    _session->config.ParameterChanged.connect_same_thread (connection_with_session_config, boost::bind (&ARDOUR_UI::on_parameter_changed, this, _1));
+    session_loaded = true;
     
 	new_session->save_state(new_session->name());
 
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index d461996128..7b9fc16e86 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -189,6 +189,7 @@ ARDOUR_UI::set_session (Session *s)
 	point_zero_something_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_zero_something_seconds), 40);
 
 	update_format ();
+    update_timecode_format();
 
 	if (meter_box.get_parent()) {
 		transport_tearoff_hbox.remove (meter_box);