Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 183)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 189)
@@ -1780,6 +1780,10 @@
      */
     private void newIncidentActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_newIncidentActionPerformed
+        openIncidentCreateWindow();
+    }//GEN-LAST:event_newIncidentActionPerformed
+
+    public void openIncidentCreateWindow()
+    {
         editingIncident = false;
-
         addIncidentName.setText("");
         int newLogNum = 100;
@@ -1812,6 +1816,5 @@
 
         incidentFrame.setVisible(true);
-    }//GEN-LAST:event_newIncidentActionPerformed
-
+    }
     private void fileMenuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_fileMenuActionPerformed
     }//GEN-LAST:event_fileMenuActionPerformed
Index: trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java	(revision 137)
+++ trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java	(revision 189)
@@ -455,28 +455,31 @@
     private void btnCreateIncidentActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnCreateIncidentActionPerformed
     {//GEN-HEADEREND:event_btnCreateIncidentActionPerformed
-        int newLogNum = 100;
-        boolean found = false;
-        while (!found)
-        {
-            newLogNum++;
-            if (!scriptContainsLogNum(script, newLogNum))
-            {
-                found = true;
-                for (ScriptIncident incident : incidentList)
-                {
-                    if (incident.number == newLogNum)
-                    {
-                        found = false;
-                    }
-                }
-            }
-        }
-
-        ScriptIncident newInc = new ScriptIncident(newLogNum, "New Incident", LocalDate.now().toString(), script);
-        if (script.addIncident(newInc))
-        {
-            new IncidentEditorFrame(newInc, parent).setVisible(true);
-            this.dispose();
-        }
+       parent.openIncidentCreateWindow();
+       this.dispose();
+//        int newLogNum = 100;
+//        boolean found = false;
+//        while (!found)
+//        {
+//            newLogNum++;
+//            if (!scriptContainsLogNum(script, newLogNum))
+//            {
+//                found = true;
+//                for (ScriptIncident incident : incidentList)
+//                {
+//                    if (incident.number == newLogNum)
+//                    {
+//                        found = false;
+//                    }
+//                }
+//            }
+//        }
+//        parent.
+//
+//        ScriptIncident newInc = new ScriptIncident(newLogNum, "New Incident", LocalDate.now().toString(), script);
+//        if (script.addIncident(newInc))
+//        {
+//            new IncidentEditorFrame(newInc, parent).setVisible(true);
+//            this.dispose();
+//        }
 
     }//GEN-LAST:event_btnCreateIncidentActionPerformed