diff --git a/app/src/processing/app/RunnerListenerEdtAdapter.java b/app/src/processing/app/RunnerListenerEdtAdapter.java
new file mode 100644
index 000000000..a436eefbc
--- /dev/null
+++ b/app/src/processing/app/RunnerListenerEdtAdapter.java
@@ -0,0 +1,48 @@
+package processing.app;
+
+import java.awt.EventQueue;
+
+public class RunnerListenerEdtAdapter implements RunnerListener {
+
+  private RunnerListener wrapped;
+
+  public RunnerListenerEdtAdapter(RunnerListener wrapped) {
+    this.wrapped = wrapped;
+  }
+
+  @Override
+  public void statusError(String message) {
+    EventQueue.invokeLater(() -> wrapped.statusError(message));
+  }
+
+  @Override
+  public void statusError(Exception exception) {
+    EventQueue.invokeLater(() -> wrapped.statusError(exception));
+  }
+
+  @Override
+  public void statusNotice(String message) {
+    EventQueue.invokeLater(() -> wrapped.statusNotice(message));
+  }
+
+  @Override
+  public void startIndeterminate() {
+    EventQueue.invokeLater(() -> wrapped.startIndeterminate());
+  }
+
+  @Override
+  public void stopIndeterminate() {
+    EventQueue.invokeLater(() -> wrapped.stopIndeterminate());
+  }
+
+  @Override
+  public void statusHalt() {
+    EventQueue.invokeLater(() -> wrapped.statusHalt());
+  }
+
+  @Override
+  public boolean isHalted() {
+    return wrapped.isHalted();
+  }
+}
+
diff --git a/java/src/processing/mode/java/Debugger.java b/java/src/processing/mode/java/Debugger.java
index ac6835b21..3fcb069d5 100644
--- a/java/src/processing/mode/java/Debugger.java
+++ b/java/src/processing/mode/java/Debugger.java
@@ -39,6 +39,7 @@ import javax.swing.JTree; // needed for javadocs
 import javax.swing.tree.DefaultMutableTreeNode;
 
 import processing.app.Messages;
+import processing.app.RunnerListenerEdtAdapter;
 import processing.app.Sketch;
 import processing.app.SketchCode;
 import processing.mode.java.debug.*;
@@ -201,7 +202,7 @@ public class Debugger {
         //lineMap = LineMapping.generateMapping(srcPath + File.separator + mainClassName + ".java");
 
         log("launching debuggee runtime");
-        runtime = new Runner(build, editor);
+        runtime = new Runner(build, new RunnerListenerEdtAdapter(editor));
         VirtualMachine vm = runtime.debug(null); // non-blocking
         if (vm == null) {
           loge("error 37: launch failed", null);
diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 10c825027..c95c9094f 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -1093,10 +1093,11 @@ public class JavaEditor extends Editor {
         synchronized (runtimeLock) {
           if (runtimeLaunchRequested) {
             runtimeLaunchRequested = false;
+            RunnerListener listener = new RunnerListenerEdtAdapter(JavaEditor.this);
             if (!tweak) {
-              runtime = jmode.handleLaunch(sketch, JavaEditor.this, present);
+              runtime = jmode.handleLaunch(sketch, listener, present);
             } else {
-              runtime = jmode.handleTweak(sketch, JavaEditor.this);
+              runtime = jmode.handleTweak(sketch, listener);
             }
           }
         }