Index: gtk2_ardour/route_time_axis.cc
===================================================================
--- gtk2_ardour/route_time_axis.cc	(revision 3584)
+++ gtk2_ardour/route_time_axis.cc	(working copy)
@@ -745,9 +745,14 @@
 	} else {
 
 		hide_meter ();
-		hide_name_entry ();
-		show_name_label ();
 		
+		// don't hide name_entry if the user is editing it: this might 
+		// look a bit funny, but it's better than locking up...		
+		if (!name_entry.has_focus() || name_entry.get_text() == _route->name()) {
+			hide_name_entry ();
+			show_name_label ();
+		}	
+		
 		gm.get_gain_slider().hide();
 		mute_button->hide();
 		solo_button->hide();