diff --git a/plugins/Experiment.java b/plugins/Experiment.java
index b6c6fb1b..c62a30e6 100644
--- a/plugins/Experiment.java
+++ b/plugins/Experiment.java
@@ -3,6 +3,7 @@ import ch.psi.utils.State;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.swing.SwingUtilities;
 
 /**
  *
@@ -16,7 +17,9 @@ public class Experiment extends Panel {
     //Overridable callbacks
     @Override
     public void onInitialize(int runCount) {
-        undo();
+        SwingUtilities.invokeLater(()->{
+            undo();
+        });        
     }
 
     @Override