diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 1f83d4b2f..11d5d6dbb 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -1360,6 +1360,8 @@ public class JavaEditor extends Editor {
     }
     getDebugger().dispose();
     getPreprocessingService().dispose();
+    debugger = null;
+    preprocService = null;
 
     inspect.dispose();
     usage.dispose();
@@ -1862,6 +1864,7 @@ public class JavaEditor extends Editor {
   public void toggleDebug() {
 //    debugEnabled = !debugEnabled;
 
+    getDebugger().toggleEnabled();
     rebuildToolbar();
     repaint();  // show/hide breakpoints in the gutter
 
diff --git a/java/src/processing/mode/java/debug/Debugger.java b/java/src/processing/mode/java/debug/Debugger.java
index 6988ca185..4da96370e 100644
--- a/java/src/processing/mode/java/debug/Debugger.java
+++ b/java/src/processing/mode/java/debug/Debugger.java
@@ -203,7 +203,7 @@ public class Debugger {
   }
 
 
-  void toggleEnabled() {
+  public void toggleEnabled() {
     enabled = !enabled;
 
     if (enabled) {