diff --git a/ocarina/footer/now_playing.cpp b/ocarina/footer/now_playing.cpp
index fe213e34..076f02b5 100644
--- a/ocarina/footer/now_playing.cpp
+++ b/ocarina/footer/now_playing.cpp
@@ -8,28 +8,32 @@ static GtkWidget *title  = NULL;
 static GtkWidget *artist = NULL;
 static GtkWidget *album  = NULL;
 
+static void set_label(GtkWidget *label, string text, string size)
+{
+	string escaped = g_markup_escape_text(text.c_str(), -1);
+	string markup  = "<span size='" + size + "'>" + escaped + "</span>";
+	gtk_label_set_markup(GTK_LABEL(label), markup.c_str());
+}
+
 static void set_title(string new_title)
 {
-	string markup = "<span size='xx-large'>" + new_title + "</span>";
-	gtk_label_set_markup(GTK_LABEL(title), markup.c_str());
+	set_label(title, new_title, "xx-large");
 }
 
 static void set_artist(string new_artist)
 {
-	string markup = "<span size='x-large'>" + new_artist + "</span>";
-	gtk_label_set_markup(GTK_LABEL(artist), markup.c_str());
+	set_label(artist, new_artist, "x-large");
 }
 
 static void set_album(string new_album)
 {
-	string markup = "<span size='x-large'>" + new_album + "</span>";
-	gtk_label_set_markup(GTK_LABEL(album), markup.c_str());
+	set_label(album, new_album, "x-large");
 }
 
 static GtkWidget *align(GtkWidget *label)
 {
 	GtkWidget *alignment = gtk_alignment_new(0.0, 0.5, 0.0, 0.0);
-	gtk_container_add(GTK_CONTAINER(alignment), label);
+	container_add(alignment, label);
 	return alignment;
 }