Index: gtk2_ardour/route_time_axis.cc
===================================================================
--- gtk2_ardour/route_time_axis.cc	(revision 4224)
+++ gtk2_ardour/route_time_axis.cc	(working copy)
@@ -758,9 +758,17 @@
 	} else {
 
 		hide_meter ();
-		hide_name_entry ();
-		show_name_label ();
 		
+		if (!name_entry.has_focus() || name_entry.get_text() == _route->name()) {
+			// only hide name_entry if the user is not editing it: 
+			// this might look a bit funny, but it's better than
+			// locking up...
+			hide_name_entry ();
+			show_name_label ();
+		}	
+		// else possibly it'd be better to accept the changed name here
+		// as if the user hit enter before shrinking the track.
+		
 		gm.get_gain_slider().hide();
 		mute_button->hide();
 		solo_button->hide();