Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 100)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 103)
@@ -25,4 +25,5 @@
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.event.ChangeEvent;
 import scriptbuilder.gui.panels.IncidentTimelinePanel;
 import scriptbuilder.structures.ScriptEvent;
@@ -1537,5 +1538,5 @@
             script.incidents.get(indx).setOffset((Integer) addIncidentStart.getValue() * 60);
             script.numberOfIncidents++;
-            new IncidentEditorFrame(script.incidents.get(indx)).setVisible(true);
+            new IncidentEditorFrame(script.incidents.get(indx), this).setVisible(true);
         }
         else//editing existing incident
@@ -1726,4 +1727,10 @@
     }//GEN-LAST:event_incidentDetailsActionPerformed
 
+    public void returnFocus()
+    {
+        zoomSlider.setValue(zoomSlider.getMinimum());
+        zoomSliderStateChanged(new ChangeEvent(script));
+    }
+    
     public void incidentDetailsScreen(ScriptIncident i)
     {
@@ -1994,5 +2001,5 @@
             if (inc != null)
             {
-                IncidentEditorFrame editor = new IncidentEditorFrame(inc);
+                IncidentEditorFrame editor = new IncidentEditorFrame(inc, this);
                 script.addObserver(editor);
                 editor.setVisible(true);