diff --git a/uk/ac/sanger/artemis/components/FeatureEdit.java b/uk/ac/sanger/artemis/components/FeatureEdit.java
index be5b91654207b08036a6b0e2be2c14078ae35028..225d175e1aa075d0ffa2e3718720f4e8658e383f 100644
--- a/uk/ac/sanger/artemis/components/FeatureEdit.java
+++ b/uk/ac/sanger/artemis/components/FeatureEdit.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/FeatureEdit.java,v 1.29 2007-03-15 11:40:47 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/FeatureEdit.java,v 1.30 2007-03-19 10:15:03 tjc Exp $
  **/
 
 package uk.ac.sanger.artemis.components;
@@ -66,7 +66,7 @@ import javax.swing.*;
  *  FeatureEdit class
  *
  *  @author Kim Rutherford
- *  @version $Id: FeatureEdit.java,v 1.29 2007-03-15 11:40:47 tjc Exp $
+ *  @version $Id: FeatureEdit.java,v 1.30 2007-03-19 10:15:03 tjc Exp $
  **/
 public class FeatureEdit extends JPanel
                          implements EntryChangeListener, FeatureChangeListener 
@@ -788,7 +788,8 @@ public class FeatureEdit extends JPanel
     {
       public void actionPerformed(ActionEvent e) 
       {
-        stopListening();
+        if(edit_feature.getEntry() != null)
+          stopListening();
         frame.dispose();
       }
     });