diff --git a/XenAdmin/Dialogs/PropertiesDialog.cs b/XenAdmin/Dialogs/PropertiesDialog.cs
index bdac9b8a8..94f72f9f4 100755
--- a/XenAdmin/Dialogs/PropertiesDialog.cs
+++ b/XenAdmin/Dialogs/PropertiesDialog.cs
@@ -134,7 +134,7 @@ namespace XenAdmin.Dialogs
 
                 ShowTab(GeneralEditPage = new GeneralEditPage());
 
-                if (!isVmAppliance)
+                if (!isVmAppliance && !isVmss)
                     ShowTab(CustomFieldsEditPage = new CustomFieldsDisplayPage {AutoScroll = true});
 
                 if (isVm)
diff --git a/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs b/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs
index 7b4f833a2..d446acb2b 100644
--- a/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs
+++ b/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs
@@ -342,7 +342,7 @@ namespace XenAdmin.SettingsPanels
                 return new Label
                 {
                     Anchor = AnchorStyles.Left | AnchorStyles.Right,
-                    Text = customFieldDefinition.Name.EscapeAmpersands().Ellipsise(25),
+                    Text = customFieldDefinition.Name.EscapeAmpersands().Ellipsise(45),
                     Font = Program.DefaultFont,
                     AutoSize = true,
                     AutoEllipsis = false