diff --git a/uk/ac/sanger/artemis/components/ListSelectionPanel.java b/uk/ac/sanger/artemis/components/ListSelectionPanel.java
index 122fab64d5c50abc6e13a0f2a2aa8a51390e366e..6c3e0a5d0b45eec509fd5221967c240de852956c 100644
--- a/uk/ac/sanger/artemis/components/ListSelectionPanel.java
+++ b/uk/ac/sanger/artemis/components/ListSelectionPanel.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/ListSelectionPanel.java,v 1.4 2007-03-28 11:56:35 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/ListSelectionPanel.java,v 1.5 2007-07-09 13:03:45 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.components;
@@ -39,6 +39,7 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
 import uk.ac.sanger.artemis.EntryGroup;
+import uk.ac.sanger.artemis.io.GFFDocumentEntry;
 
 class ListSelectionPanel extends JPanel
 {
@@ -125,8 +126,11 @@ class ListSelectionPanel extends JPanel
     
     add(bdown, BorderLayout.CENTER);
 
+    boolean isGFF = false;
+    if(entry_group.getDefaultEntry().getEMBLEntry() instanceof GFFDocumentEntry)
+      isGFF = true;
     final QualifierChoice qualifier_choice = new QualifierChoice(
-        entry_group.elementAt(0).getEntryInformation(), null, null);
+        entry_group.elementAt(0).getEntryInformation(), null, null, isGFF);
     
     JButton add_butt = new JButton("ADD");
     add_butt.addActionListener(new ActionListener()
diff --git a/uk/ac/sanger/artemis/components/QualifierEditor.java b/uk/ac/sanger/artemis/components/QualifierEditor.java
index 7c5b47a9b578ba09f91bd09af39ffcaef83c2ab8..3a87681852c897381386213af844c4c8db283701 100644
--- a/uk/ac/sanger/artemis/components/QualifierEditor.java
+++ b/uk/ac/sanger/artemis/components/QualifierEditor.java
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/QualifierEditor.java,v 1.4 2005-02-17 10:36:28 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/QualifierEditor.java,v 1.5 2007-07-09 13:07:38 tjc Exp $
  */
 
 package uk.ac.sanger.artemis.components;
@@ -28,6 +28,7 @@ package uk.ac.sanger.artemis.components;
 import uk.ac.sanger.artemis.*;
 
 import uk.ac.sanger.artemis.util.ReadOnlyException;
+import uk.ac.sanger.artemis.io.GFFDocumentEntry;
 import uk.ac.sanger.artemis.io.Qualifier;
 import uk.ac.sanger.artemis.io.QualifierInfo;
 import uk.ac.sanger.artemis.io.QualifierVector;
@@ -46,7 +47,7 @@ import javax.swing.*;
  *  features at once.
  *
  *  @author Kim Rutherford <kmr@sanger.ac.uk>
- *  @version $Id: QualifierEditor.java,v 1.4 2005-02-17 10:36:28 tjc Exp $
+ *  @version $Id: QualifierEditor.java,v 1.5 2007-07-09 13:07:38 tjc Exp $
  **/
 
 public class QualifierEditor extends JFrame {
@@ -69,8 +70,11 @@ public class QualifierEditor extends JFrame {
 
     setFont (font);
 
+    boolean isGFF = false;
+    if(entry_group.getDefaultEntry().getEMBLEntry() instanceof GFFDocumentEntry)
+      isGFF = true;
     final QualifierChoice qualifier_choice =
-      new QualifierChoice (entry_information, first_feature.getKey (), null);
+      new QualifierChoice (entry_information, first_feature.getKey (), null, isGFF);
 
     final JPanel outer_qualifier_choice_panel = new JPanel ();
     final JPanel qualifier_choice_panel = new JPanel ();