diff --git a/gtk2_ardour/device_connection_control.cc b/gtk2_ardour/device_connection_control.cc
index dd46420bee..24b84b80a6 100644
--- a/gtk2_ardour/device_connection_control.cc
+++ b/gtk2_ardour/device_connection_control.cc
@@ -75,6 +75,7 @@ void DeviceConnectionControl::init(const std::string& name, bool active, uint16_
 
 	if (_name_label != NULL) {
 		_name_label->set_text (name);
+		_name_label->set_tooltip_text(name);
 	}
 
 	if (_number_label != NULL) {
@@ -121,6 +122,7 @@ DeviceConnectionControl::set_track_name (const std::string& new_track_name)
 {
     if (_track_name_label != NULL ) {
 		_track_name_label->set_text (new_track_name);
+		_track_name_label->set_tooltip_text(new_track_name);
         if (new_track_name.empty() ) {
             _track_name_label->get_parent()->hide();
         } else {
diff --git a/gtk2_ardour/midi_device_connection_control.cc b/gtk2_ardour/midi_device_connection_control.cc
index b7437fd211..c7699865af 100644
--- a/gtk2_ardour/midi_device_connection_control.cc
+++ b/gtk2_ardour/midi_device_connection_control.cc
@@ -73,6 +73,7 @@ void MidiDeviceConnectionControl::init(const std::string& name, bool capture_act
     }
 
     _name_label->set_text (name);
+	_name_label->set_tooltip_text(name);
     
 	set_capture_active(capture_active);
     set_playback_active(playback_active);