diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 589c92b954..d2c390a0e4 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -122,12 +122,8 @@ ExportDialog::set_session (ARDOUR::Session* s)
 	preset_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::maybe_set_session_dirty));
 	timespan_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::maybe_set_session_dirty));
 	channel_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::maybe_set_session_dirty));
-	channel_selector->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::maybe_set_session_dirty));
 	file_notebook->CriticalSelectionChanged.connect (sigc::mem_fun (*this, &ExportDialog::maybe_set_session_dirty));
 
-	update_warnings_and_example_filename ();
-	update_realtime_selection ();
-
 	_initialized = true;
 
 	_session->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&ExportDialog::parameter_changed, this, _1), gui_context());
diff --git a/gtk2_ardour/export_file_notebook.cc b/gtk2_ardour/export_file_notebook.cc
index 2a9561f1ac..f04550dd0e 100644
--- a/gtk2_ardour/export_file_notebook.cc
+++ b/gtk2_ardour/export_file_notebook.cc
@@ -291,8 +291,8 @@ ExportFileNotebook::FilePage::FilePage (Session * s, ManagerPtr profile_manager,
 	tab_widget.pack_start (tab_label, false, false, 3);
 	tab_widget.pack_end (tab_close_alignment, false, false, 0);
 	tab_widget.show_all_children ();
+
 	update_tab_label ();
-	update_example_filename();
 
 	/* Done */
 
@@ -380,7 +380,11 @@ void
 ExportFileNotebook::FilePage::critical_selection_changed ()
 {
 	update_tab_label();
-	update_example_filename();
+
+	/* Note: `update_example_filename()` is called from
+	 * `ExportDialog::update_warnings_and_example_filename()`
+	 * in response to CriticalSelectionChanged
+	 */
 
 	soundcloud_button_connection.block ();
 	analysis_button_connection.block ();