diff --git a/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs b/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs
index ebf8c5a93..e93218f1c 100644
--- a/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs
+++ b/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs
@@ -243,7 +243,7 @@ namespace XenAdmin.SettingsPanels
                 {
                     // Create the display label
                     Label lblKey = new Label();
-                    lblKey.Text = customFieldDefinition.Name;
+                    lblKey.Text = customFieldDefinition.Name.EscapeAmpersands();
                     lblKey.Margin = new Padding(3, 7, 3, 3);
                     lblKey.Font = Program.DefaultFont;
                     lblKey.Width = (int)tableLayoutPanel.ColumnStyles[0].Width;
diff --git a/XenAdmin/TabPages/PerformancePage.cs b/XenAdmin/TabPages/PerformancePage.cs
index b83e89f51..3eb90dc80 100644
--- a/XenAdmin/TabPages/PerformancePage.cs
+++ b/XenAdmin/TabPages/PerformancePage.cs
@@ -360,10 +360,9 @@ namespace XenAdmin.TabPages
 
         private void DeleteGraph()
         {
-            var formattableName = GraphList.SelectedGraph.DisplayName.Replace("&", "&&");
             using (ThreeButtonDialog dlog = new ThreeButtonDialog(
                 new ThreeButtonDialog.Details(SystemIcons.Warning,
-                    string.Format(Messages.DELETE_GRAPH_MESSAGE, formattableName),
+                    string.Format(Messages.DELETE_GRAPH_MESSAGE, GraphList.SelectedGraph.DisplayName.EscapeAmpersands()),
                     Messages.XENCENTER),
                 ThreeButtonDialog.ButtonYes,
                 ThreeButtonDialog.ButtonNo))