diff --git a/XenAdmin/SettingsPanels/VBDEditPage.cs b/XenAdmin/SettingsPanels/VBDEditPage.cs
index 111d50540..10a9e8d9a 100644
--- a/XenAdmin/SettingsPanels/VBDEditPage.cs
+++ b/XenAdmin/SettingsPanels/VBDEditPage.cs
@@ -391,7 +391,7 @@ namespace XenAdmin.SettingsPanels
                     return position;
 
                 if (vdi != null)
-                    return string.Format(Messages.VBD_EDIT_CURRENTLY_IN_USE_BY, position, vdi.ToString());
+                    return string.Format(Messages.VBD_EDIT_CURRENTLY_IN_USE_BY, position, vdi.ToString().Ellipsise(30));
 
                 return string.Format(Messages.VBD_EDIT_CURRENTLY_IN_USE, position);
             }
diff --git a/XenAdmin/SettingsPanels/VBDEditPage.resx b/XenAdmin/SettingsPanels/VBDEditPage.resx
index a27d4c042..4d9759822 100644
--- a/XenAdmin/SettingsPanels/VBDEditPage.resx
+++ b/XenAdmin/SettingsPanels/VBDEditPage.resx
@@ -195,9 +195,15 @@
   <data name="devicePositionComboBox.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
+  <data name="devicePositionComboBox.IntegralHeight" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="devicePositionComboBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>122, 84</value>
   </data>
+  <data name="devicePositionComboBox.MaxDropDownItems" type="System.Int32, mscorlib">
+    <value>15</value>
+  </data>
   <data name="devicePositionComboBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>281, 21</value>
   </data>