diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc
index 9043da3124..c3cf20d41b 100644
--- a/gtk2_ardour/export_channel_selector.cc
+++ b/gtk2_ardour/export_channel_selector.cc
@@ -739,7 +739,11 @@ TrackExportChannelSelector::update_config()
 		}
 
 		if (state) {
-			state->config->set_name (route->name());
+			if (_session->config.get_track_name_number() && route->track_number() > 0) {
+				state->config->set_name (string_compose ("%1-%2", route->track_number(), route->name()));
+			} else {
+				state->config->set_name (route->name());
+			}
 		}
 
 	}