diff --git a/uk/ac/sanger/artemis/editor/BigPane.java b/uk/ac/sanger/artemis/editor/BigPane.java
index 6cc0903584549dc8f81f4eeaa8c6cb644e6b3387..56ac6bc98804de411a22e55660f1af00d432902b 100644
--- a/uk/ac/sanger/artemis/editor/BigPane.java
+++ b/uk/ac/sanger/artemis/editor/BigPane.java
@@ -82,6 +82,9 @@ public class BigPane extends JFrame
   public BigPane()
   {
     super("Object Editor");
+    addWindowListener(new winExit());
+    setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+    MultiLineToolTipUI.initialize();
   }
 
   public void set(Hashtable dataFile, JTextArea qualifier,
@@ -98,10 +101,8 @@ public class BigPane extends JFrame
   {
     //this.overlapFeature = overlapFeature;
     this.edit_feature   = edit_feature;
-
     addNote.setSelected(false);
-    setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-    MultiLineToolTipUI.initialize();
+    
     setFont(font);
 
     if(desktop == null)
@@ -123,8 +124,6 @@ public class BigPane extends JFrame
               screenSize.width  - inset*2,
               screenSize.height - inset*2);
 
-    addWindowListener(new winExit());
-
     final JScrollPane scrollEvidence = new JScrollPane();
     // data set
     final int hgt = getHeight()-85;
@@ -378,6 +377,7 @@ public class BigPane extends JFrame
     dataView.stopGetz();
     dataView.dispose();
     BigPane.srsFrame = null;
+    dispose();
   }