diff --git a/uk/ac/sanger/artemis/components/alignment/BamView.java b/uk/ac/sanger/artemis/components/alignment/BamView.java
index b9b4cebff0c0d7c85b78f1555f7d18d78cb5d4b4..b3349b6e604b6e7ea3d8e679170a706536541e5c 100644
--- a/uk/ac/sanger/artemis/components/alignment/BamView.java
+++ b/uk/ac/sanger/artemis/components/alignment/BamView.java
@@ -3594,14 +3594,12 @@ public class BamView extends JPanel
       if(feature_display.getEntryGroup().getSequenceEntry().getEMBLEntry().getSequence() 
           instanceof uk.ac.sanger.artemis.io.IndexFastaStream)
       {
-        if(SwingUtilities.getWindowAncestor(feature_display) instanceof EntryEdit)
+        if(entry_edit != null)
         {
-          final EntryEdit ee = (EntryEdit)SwingUtilities.getWindowAncestor(feature_display);
-          ee.getOneLinePerEntryDisplay().addDisplayAdjustmentListener(bamView);
-
+          entry_edit.getOneLinePerEntryDisplay().addDisplayAdjustmentListener(bamView);
           // add reference sequence selection listeners
-          ee.getEntryGroupDisplay().getIndexFastaCombo().addIndexReferenceListener(bamView.getCombo());
-          bamView.getCombo().addIndexReferenceListener(ee.getEntryGroupDisplay().getIndexFastaCombo());
+          entry_edit.getEntryGroupDisplay().getIndexFastaCombo().addIndexReferenceListener(bamView.getCombo());
+          bamView.getCombo().addIndexReferenceListener(entry_edit.getEntryGroupDisplay().getIndexFastaCombo());
         }
       }
     }