diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 7d02c1c828..ab494030b0 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -421,6 +421,10 @@ MixerStrip::begin_name_edit ()
     if( _route->is_master () )
         return;
     
+    boost::shared_ptr<AudioTrack> audio_track = boost::dynamic_pointer_cast<AudioTrack>(_route);
+    if( audio_track && audio_track->is_master_track() )
+        return;
+    
     _name_entry.set_text ( _route->name() );
     name_button.hide();
     _name_entry.show ();
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 280d51b0a8..6e67b6636d 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -2271,6 +2271,14 @@ RouteTimeAxisView::reset_processor_automation_curves ()
 bool
 RouteTimeAxisView::can_edit_name () const
 {
+    if( _route->is_master () )
+        return false;
+    
+    boost::shared_ptr<AudioTrack> audio_track = boost::dynamic_pointer_cast<AudioTrack>( _route );
+    
+    if( audio_track && audio_track->is_master_track() )
+        return false;
+    
 	/* we do not allow track name changes if it is record enabled
 	 */
 	return !_route->record_enabled();