diff --git a/pdex/src/processing/mode/experimental/DebugToolbar.java b/pdex/src/processing/mode/experimental/DebugToolbar.java
index 817627a51..e094176ad 100755
--- a/pdex/src/processing/mode/experimental/DebugToolbar.java
+++ b/pdex/src/processing/mode/experimental/DebugToolbar.java
@@ -159,6 +159,7 @@ public class DebugToolbar extends JavaToolbar {
       super.handlePressed(e, JavaToolbar.EXPORT);
       break;
     case DEBUG:
+      deditor.handleStop(); // Close any running sketches
       if (shift) {
         Logger.getLogger(DebugToolbar.class.getName()).log(Level.INFO, "Invoked 'Run' toolbar button");
         deditor.handleRun();