diff --git a/uk/ac/sanger/artemis/components/EditMenu.java b/uk/ac/sanger/artemis/components/EditMenu.java
index df8f3b88fc7f4fd09e492d6900f94f87fc0362d6..5b8e7912c36c942f1ada52224e3902ca01411d4a 100644
--- a/uk/ac/sanger/artemis/components/EditMenu.java
+++ b/uk/ac/sanger/artemis/components/EditMenu.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/EditMenu.java,v 1.34 2007-10-10 14:34:07 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/EditMenu.java,v 1.35 2007-10-10 14:42:58 tjc Exp $
  **/
 
 package uk.ac.sanger.artemis.components;
@@ -58,7 +58,7 @@ import java.util.Vector;
  *  A menu with editing commands.
  *
  *  @author Kim Rutherford
- *  @version $Id: EditMenu.java,v 1.34 2007-10-10 14:34:07 tjc Exp $
+ *  @version $Id: EditMenu.java,v 1.35 2007-10-10 14:42:58 tjc Exp $
  **/
 
 public class EditMenu extends SelectionMenu
@@ -353,6 +353,7 @@ public class EditMenu extends SelectionMenu
     });
 
     final JMenuItem unmerge_feature_item = new JMenuItem("Unmerge Selected Feature");
+      
     unmerge_feature_item.addActionListener(new ActionListener() 
     {
       public void actionPerformed(ActionEvent event) 
@@ -362,6 +363,11 @@ public class EditMenu extends SelectionMenu
     });
 
     final JMenuItem unmerge_all_feature_item = new JMenuItem("Unmerge All Feature Segments");
+    if(GeneUtils.isDatabaseEntry(entry_group))
+    {
+      unmerge_feature_item.setEnabled(false);
+      unmerge_all_feature_item.setEnabled(false);
+    }
     unmerge_all_feature_item.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent event)