diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 866fce648c..32fbd1ac7d 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -320,7 +320,7 @@ MixerStrip::init ()
 	/* note that this handler connects *before* the default handler */
 	_name_button_home.signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::controls_ebox_button_press));
     _name_button_home.signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::controls_ebox_button_release));
-    _name_entry.set_max_length(13);
+    _name_entry.set_max_length(250);
     
     deletion_in_progress = false;
 }
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 10420ea244..50cc292758 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -132,7 +132,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess,
 	name_entry.signal_focus_out_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_out));
 	name_entry.set_text (name_label.get_text());
 	name_entry.signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisView::end_name_edit), RESPONSE_OK));
-    name_entry.set_max_length(13);
+    name_entry.set_max_length(250);
     
 	controls_event_box.add_events (Gdk::BUTTON_PRESS_MASK|
 								   Gdk::BUTTON_RELEASE_MASK|
diff --git a/gtk2_ardour/ui/audio_time_axis.xml b/gtk2_ardour/ui/audio_time_axis.xml
index 8bb28da2ef..4103b55c66 100644
--- a/gtk2_ardour/ui/audio_time_axis.xml
+++ b/gtk2_ardour/ui/audio_time_axis.xml
@@ -45,6 +45,7 @@
                       visible="false"/>
           <HBox height="5"/>
           <Label id="name_label"
+                 width="83"
                  winfont ="Arial 10"
                  macfont ="Helvetica 10"
                  fgnormal="#ffffff"