Index: trunk/src/tmcsim/simulationmanager/SimulationManagerView.java
===================================================================
--- trunk/src/tmcsim/simulationmanager/SimulationManagerView.java	(revision 416)
+++ trunk/src/tmcsim/simulationmanager/SimulationManagerView.java	(revision 459)
@@ -26,4 +26,5 @@
 import javax.swing.JTable;
 import javax.swing.SpinnerNumberModel;
+import javax.swing.SwingUtilities;
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.EtchedBorder;
@@ -181,12 +182,13 @@
      * @param logNumber Log number for this incident.
      */ 
-    public void addIncidentTab(Integer logNumber) {
-        
-        IncidentHistoryPanel newHistoryPanel = new IncidentHistoryPanel();
-    
-        incidentTableMap.put(logNumber, newHistoryPanel);
-
-        eventHistoryPane.addTab(String.valueOf(logNumber), newHistoryPanel);
-        
+    public void addIncidentTab(final Integer logNumber) {
+        // Place this code on EDT to fix defect #154
+        SwingUtilities.invokeLater(new Runnable(){public void run(){
+            IncidentHistoryPanel newHistoryPanel = new IncidentHistoryPanel();
+
+            incidentTableMap.put(logNumber, newHistoryPanel);
+
+            eventHistoryPane.addTab(String.valueOf(logNumber), newHistoryPanel);
+        }});
     }