diff --git a/extra/jheidi/bin/jheidi b/extra/jheidi/bin/jheidi
index 89ec6536..6dc2c0a9 100755
--- a/extra/jheidi/bin/jheidi
+++ b/extra/jheidi/bin/jheidi
@@ -1,3 +1,3 @@
 #bin/sh
 
-java -DusePrecompiledClassFiles=true -cp jheidi.jar:lib/ajl.jar:lib/editor.jar:lib/mysql-connector-java-5.0.7-bin.jar:lib/log4j-1.2.13.jar -Dlog4jconfig=logs/log4jconfig.xml com.rendion.ajl.AjlScript jheidi
+java -DstartEDT=true -DusePrecompiledClassFiles=true -cp jheidi.jar:lib/ajl.jar:lib/editor.jar:lib/mysql-connector-java-5.0.7-bin.jar:lib/log4j-1.2.13.jar -Dlog4jconfig=logs/log4jconfig.xml com.rendion.ajl.AjlScript jheidi
diff --git a/extra/jheidi/bin/jheidi-osx b/extra/jheidi/bin/jheidi-osx
index 0a9ac80a..89d4c741 100755
--- a/extra/jheidi/bin/jheidi-osx
+++ b/extra/jheidi/bin/jheidi-osx
@@ -1,3 +1,3 @@
 #bin/sh
 
-java -Dapple.laf.useScreenMenuBar=true -Djava.library.path=lib -Xdock:name="JHeidi" -DusePrecompiledClassFiles=true -cp lib/quaqua.jar:jheidi.jar:lib/ajl.jar:lib/editor.jar:lib/mysql-connector-java-5.0.7-bin.jar:lib/log4j-1.2.13.jar -Dlog4jconfig=logs/log4jconfig.xml com.rendion.ajl.AjlScript jheidi
+java -DstartEDT=true -Dapple.laf.useScreenMenuBar=true -Djava.library.path=lib -Xdock:name="JHeidi" -DusePrecompiledClassFiles=true -cp lib/quaqua.jar:jheidi.jar:lib/ajl.jar:lib/editor.jar:lib/mysql-connector-java-5.0.7-bin.jar:lib/log4j-1.2.13.jar -Dlog4jconfig=logs/log4jconfig.xml com.rendion.ajl.AjlScript jheidi
diff --git a/extra/jheidi/bin/jheidi.cmd b/extra/jheidi/bin/jheidi.cmd
index c23ca338..8cedf06e 100755
--- a/extra/jheidi/bin/jheidi.cmd
+++ b/extra/jheidi/bin/jheidi.cmd
@@ -1,3 +1,3 @@
 @echo off
 
-java -DusePrecompiledClassFiles=true -cp jheidi.jar;lib/ajl.jar;lib/editor.jar;lib/mysql-connector-java-5.0.7-bin.jar;lib/log4j-1.2.13.jar -Dlog4jconfig=logs/log4jconfig.xml com.rendion.ajl.AjlScript jheidi
+java -DstartEDT=true -DusePrecompiledClassFiles=true -cp jheidi.jar;lib/ajl.jar;lib/editor.jar;lib/mysql-connector-java-5.0.7-bin.jar;lib/log4j-1.2.13.jar -Dlog4jconfig=logs/log4jconfig.xml com.rendion.ajl.AjlScript jheidi