diff --git a/uk/ac/sanger/artemis/components/genebuilder/cv/CVPanel.java b/uk/ac/sanger/artemis/components/genebuilder/cv/CVPanel.java
index ab246b7dbd1165601e8187f0dc45e50ebc95b2b3..cf9845e4c5947a5e3fc3637215d22a30475d1ae4 100644
--- a/uk/ac/sanger/artemis/components/genebuilder/cv/CVPanel.java
+++ b/uk/ac/sanger/artemis/components/genebuilder/cv/CVPanel.java
@@ -29,6 +29,7 @@ import java.awt.Component;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.FontMetrics;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
@@ -338,7 +339,7 @@ public class CVPanel extends JPanel
                             dimension.height));
           else
             termLabel.setPreferredSize(
-                new Dimension(dimension.width,
+                new Dimension(getWidthOfGoField()+dimension.width,
                               dimension.height));
           xHeadings.add(termLabel);
           
@@ -483,6 +484,12 @@ public class CVPanel extends JPanel
   }
   
 
+  private static int getWidthOfGoField()
+  {
+    JTextField textField = new JTextField();
+    FontMetrics fm  = textField.getFontMetrics(textField.getFont());
+    return fm.stringWidth("GO:0001234 [F] ");  
+  }
   
   private JButton getRemoveButton(final Qualifier this_qualifier, 
                                   final int v_index)