diff --git a/core/Utils.vala b/core/Utils.vala
index d3dcb2a83..70c58201f 100644
--- a/core/Utils.vala
+++ b/core/Utils.vala
@@ -100,4 +100,11 @@ namespace Maya.Util {
         var result = original_uid.dup ();
         return result.reverse ();
     }
+
+    public static string escape_markup (string escaped_text) {
+        return escaped_text.replace ("&", "&")
+                           .replace ("<", "&lt;")
+                           .replace (">", "&gt;")
+                           .replace ("'", "&#39;");
+    }
 }
diff --git a/src/Widgets/AgendaEventRow.vala b/src/Widgets/AgendaEventRow.vala
index aff388761..7fda2c5f4 100644
--- a/src/Widgets/AgendaEventRow.vala
+++ b/src/Widgets/AgendaEventRow.vala
@@ -332,7 +332,7 @@ public class Maya.View.AgendaEventRow : Gtk.ListBoxRow {
         string location_description, location_uri;
         if (location_from_component (event, out location_description, out location_uri)) {
             if (location_uri != "") {
-                location_label.label = "<a href=\"%s\">%s</a>".printf (location_uri, location_description);
+                location_label.label = "<a href=\"%s\">%s</a>".printf (location_uri, Util.escape_markup (location_description));
             } else {
                 location_label.label = location_description;
             }