diff --git a/ChangeLog b/ChangeLog
index 970099b4f..416725a6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-27  Elijah Newren  <newren@gmail.com>
+
+	* src/tabpopup.c (meta_ui_tab_popup_new): since the title is going
+	to be treated as markup, escape it.  Fixes #324846.
+
 2005-12-25  Kang Jeong-Hee  <Keizi@mail.co.kr>
 
 	* po/ko.po: Updated Korean translation.
diff --git a/src/tabpopup.c b/src/tabpopup.c
index f71e65de7..65b1568a3 100644
--- a/src/tabpopup.c
+++ b/src/tabpopup.c
@@ -208,11 +208,11 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries,
           gchar *tmp;
           if (entries[i].hidden)
             {
-              tmp = g_strdup_printf ("[%s]", entries[i].title);
+              tmp = g_markup_printf_escaped ("[%s]", entries[i].title);
             }
           else 
             {
-              tmp = g_strdup (entries[i].title);
+              tmp = g_markup_printf_escaped ("%s", entries[i].title);
             }
           
           if (entries[i].demands_attention)