diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 2c4a305d13..5ac7332b06 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -110,6 +110,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, const std::string& layout_s
     , _name_button_home (get_event_box("name_label_home"))
     , name_button (get_waves_button ("name_button"))
     , _name_entry (get_entry("name_entry"))
+    , _name_entry_eventbox (get_event_box("name_entry_eventbox"))
 	, color_palette_button (get_waves_button ("color_palette_button"))
 	, color_palette_home (get_container ("color_palette_home"))
 	, color_buttons_home (get_container ("color_buttons_home"))
@@ -192,6 +193,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
     , _name_button_home (get_event_box("name_label_home"))
     , name_button (get_waves_button ("name_button"))
     , _name_entry (get_entry ("name_entry"))
+    , _name_entry_eventbox (get_event_box("name_entry_eventbox"))
 	, color_palette_button (get_waves_button ("color_palette_button"))
 	, color_palette_home (get_container ("color_palette_home"))
 	, color_buttons_home (get_container ("color_buttons_home"))
@@ -434,10 +436,11 @@ MixerStrip::begin_name_edit ()
     
     _name_entry.set_text ( _route->name() );
     name_button.hide();
+    _name_entry_eventbox.show ();
     _name_entry.show ();
-    
+        
     _name_entry.select_region (0, -1);
-    _name_entry.set_state (STATE_SELECTED);
+    _name_entry.set_state (STATE_NORMAL);
     _name_entry.grab_focus ();
     _name_entry.start_editing (0);
 }
@@ -476,6 +479,7 @@ MixerStrip::end_name_edit (int response)
     
 	name_button.show ();
 	_name_entry.hide ();
+    _name_entry_eventbox.hide ();
 }
 
 void
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 1abdb046f7..18f5c5144e 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -177,6 +177,7 @@ class MixerStrip : public RouteUI
     void on_record_state_changed ();
     
     Gtk::Entry& _name_entry;
+    Gtk::EventBox& _name_entry_eventbox;
     void begin_name_edit ();
     void end_name_edit (int);
     
diff --git a/gtk2_ardour/ui/editor_mixer.xml b/gtk2_ardour/ui/editor_mixer.xml
index 7f8bdd633e..d2d861782e 100644
--- a/gtk2_ardour/ui/editor_mixer.xml
+++ b/gtk2_ardour/ui/editor_mixer.xml
@@ -255,12 +255,18 @@
                       fgactive="#D7D7D7"
                       winfont ="Arial 10"
                       macfont ="Helvetica 10"
-              textcolornormal="#ffffff"
-              textcoloractive="#ffffff"
-              textcolorselected="#ffffff"/>
+                      textcolornormal="#ffffff"
+                      textcoloractive="#ffffff"
+                      textcolorselected="#ffffff"/>
+              <EventBox id="name_entry_eventbox"
+                        width="95"
+                        height="47"
+                        noshowall="true"
+                        visible="false">
               <FocusEntry id="name_entry"
-                          width="57"
-                          height="28"
+                          horzalignment="center"
+                          width="80"
+                          height="20"
                           fgnormal="#ffffff"
                           winfont ="Arial 10"
                           macfont ="Helvetica 10"
@@ -270,6 +276,7 @@
                           textcolorselected="#ffffff"
                           noshowall="true"
                           visible="false"/>
+              </EventBox>
           </HBox>
           </EventBox>
             
diff --git a/gtk2_ardour/ui/meter_strip.xml b/gtk2_ardour/ui/meter_strip.xml
index 6d01445e0a..ba86929b5a 100644
--- a/gtk2_ardour/ui/meter_strip.xml
+++ b/gtk2_ardour/ui/meter_strip.xml
@@ -66,6 +66,10 @@
                           fghover="#ffffff"
                           winfont="Arial 8"
                           macfont="Helvetica 8"/>
+                    <EventBox id="name_entry_eventbox"
+                              width="37"
+                              height="24"
+                              visible="false">
                     <FocusEntry id="name_entry"
                                 width="37"
                                 height="24"
@@ -77,7 +81,8 @@
                                 textcoloractive="#ffffff"
                                 textcolorselected="#ffffff"
                                 noshowall="true"
-                                visible="false"/> 
+                                visible="false"/>
+                    </EventBox>
               </HBox>
               </EventBox>
                 
diff --git a/gtk2_ardour/ui/mixer_strip.xml b/gtk2_ardour/ui/mixer_strip.xml
index 6d6a0a1b9d..b9a0154988 100644
--- a/gtk2_ardour/ui/mixer_strip.xml
+++ b/gtk2_ardour/ui/mixer_strip.xml
@@ -66,6 +66,10 @@
                           fghover="#ffffff"
                           winfont ="Arial 10"
                           macfont ="Helvetica 10"/>
+                  <EventBox id="name_entry_eventbox"
+                            width="57"
+                            height="28"
+                            visible="false">
                   <FocusEntry id="name_entry"
                               width="57"
                               height="28"
@@ -77,7 +81,8 @@
                               textcoloractive="#ffffff"
                               textcolorselected="#ffffff"
                               noshowall="true"
-                              visible="false"/> 
+                              visible="false"/>
+                  </EventBox>
               </HBox>
               </EventBox>