diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 398edf1997..643b18af3d 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1069,10 +1069,10 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 
 	if (for_input) {
 		io_count = route->n_inputs().n_total();
-		tooltip << string_compose (_("<b>INPUT</b> to %1"), route->name());
+		tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::Markup::escape_text(route->name()));
 	} else {
 		io_count = route->n_outputs().n_total();
-		tooltip << string_compose (_("<b>OUTPUT</b> from %1"), route->name());
+		tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Glib::Markup::escape_text(route->name()));
 	}
 
 
@@ -1092,9 +1092,9 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt
 				string& connection_name (*i);
 
 				if (io_connection_count == 0) {
-					tooltip << endl << port->name().substr(port->name().find("/") + 1) << " -> " << connection_name;
+					tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) << " -> " << Glib::Markup::escape_text(connection_name);
 				} else {
-					tooltip << ", " << connection_name;
+					tooltip << ", " << Glib::Markup::escape_text(connection_name);
 				}
 
 				if (connection_name.find("ardour:") == 0) {
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 4467bdc6d7..faf0d39330 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -348,7 +348,7 @@ RouteTimeAxisView::label_view ()
 		name_label.set_text (x);
 	}
 
-	ARDOUR_UI::instance()->set_tip (name_entry, x);
+	ARDOUR_UI::instance()->set_tip (name_entry, Glib::Markup::escape_text(x));
 }
 
 void
@@ -1601,7 +1601,9 @@ RouteTimeAxisView::update_playlist_tip ()
 			/* set the playlist button tooltip to the take name */
 			ARDOUR_UI::instance()->set_tip (
 				playlist_button,
-				string_compose(_("Take: %1.%2"), escape_angled_brackets (rg->name()), escape_angled_brackets (take_name))
+				string_compose(_("Take: %1.%2"),
+					escape_angled_brackets (Glib::Markup::escape_text(rg->name())),
+					escape_angled_brackets (Glib::Markup::escape_text(take_name)))
 				);
 			
 			return;
@@ -1609,7 +1611,7 @@ RouteTimeAxisView::update_playlist_tip ()
 	}
 
 	/* set the playlist button tooltip to the playlist name */
-	ARDOUR_UI::instance()->set_tip (playlist_button, _("Playlist") + std::string(": ") + escape_angled_brackets (track()->playlist()->name()));
+	ARDOUR_UI::instance()->set_tip (playlist_button, _("Playlist") + std::string(": ") + escape_angled_brackets (Glib::Markup::escape_text(track()->playlist()->name())));
 }