diff --git a/uk/ac/sanger/artemis/components/ValidateViewer.java b/uk/ac/sanger/artemis/components/ValidateViewer.java
index f29c89a07d47d46ef6300d412d71c0b81ea66bab..6039c93bace1958a0089f6a6cd3ac43b1922fa88 100644
--- a/uk/ac/sanger/artemis/components/ValidateViewer.java
+++ b/uk/ac/sanger/artemis/components/ValidateViewer.java
@@ -63,25 +63,28 @@ class ValidateViewer extends FileViewer implements EntryGroupChangeListener
     update(features);
     setVisible(true);
 
-    final JButton fixButton = new JButton("Auto-Fix");
-    fixButton.addActionListener(new ActionListener() 
+    if( entryGrp == null || GeneUtils.isGFFEntry( entryGrp ) )
     {
-      public void actionPerformed(ActionEvent e) 
+      final JButton fixButton = new JButton("Auto-Fix Boundaries");
+      fixButton.addActionListener(new ActionListener() 
       {
-        try
+        public void actionPerformed(ActionEvent e) 
         {
-          entryGrp.getActionController().startAction();
-          for(int i=0; i<features.size(); i++)
-            fixBoundary(features.elementAt(i));
+          try
+          {
+           entryGrp.getActionController().startAction();
+            for(int i=0; i<features.size(); i++)
+              fixBoundary(features.elementAt(i));
+          }
+          finally
+          {
+            entryGrp.getActionController().endAction();
+            update(features);
+          }
         }
-        finally
-        {
-          entryGrp.getActionController().endAction();
-          update(features);
-        }
-      }
-    });
-    button_panel.add(fixButton);
+      });
+      button_panel.add(fixButton);
+    }
     
     button_panel.add(showFailedFeatures);
     showFailedFeatures.addItemListener(new ItemListener(){