diff --git a/pdex/src/processing/mode/experimental/DebugEditor.java b/pdex/src/processing/mode/experimental/DebugEditor.java
index b56310c5c..ab116429a 100755
--- a/pdex/src/processing/mode/experimental/DebugEditor.java
+++ b/pdex/src/processing/mode/experimental/DebugEditor.java
@@ -82,6 +82,7 @@ import processing.app.syntax.JEditTextArea;
 import processing.app.syntax.PdeTextAreaDefaults;
 import processing.core.PApplet;
 import processing.mode.java.JavaEditor;
+import processing.mode.java.JavaToolbar;
 
 /**
  * Main View Class. Handles the editor window including tool bar and menu. Has
@@ -568,22 +569,7 @@ public class DebugEditor extends JavaEditor implements ActionListener {
         debugMenu.add(printThreads);
         debugMenu.addSeparator();
         debugMenu.add(toggleVariableInspectorMenuItem);
-        debugMenu.addSeparator();
-
-        // TweakMode code
-        enableTweakCB = new JCheckBoxMenuItem("Tweak Enabled");
-        enableTweakCB.setSelected(ExperimentalMode.enableTweak);
-        enableTweakCB.addActionListener(new ActionListener() {
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-          ExperimentalMode.enableTweak = ((JCheckBoxMenuItem) e
-            .getSource()).isSelected();
-            dmode.savePreferences();
-          }
-        });
-        debugMenu.add(enableTweakCB);
-        // TweakMode code end
+        // debugMenu.addSeparator();
 
         // XQMode menu items
         /*        
@@ -691,6 +677,45 @@ public class DebugEditor extends JavaEditor implements ActionListener {
     public JMenu buildModeMenu() {
         return buildDebugMenu();
     }
+    
+    public JMenu buildSketchMenu() {
+      JMenuItem runItem = Toolkit.newJMenuItem(DebugToolbar
+          .getTitle(DebugToolbar.RUN, false), 'R');
+      runItem.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          handleRun();
+        }
+      });
+  
+      JMenuItem presentItem = Toolkit.newJMenuItemShift(DebugToolbar
+          .getTitle(DebugToolbar.RUN, true), 'R');
+      presentItem.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          handlePresent();
+        }
+      });
+  
+      JMenuItem stopItem = new JMenuItem(DebugToolbar.getTitle(DebugToolbar.STOP,
+                                                               false));
+      stopItem.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          handleStop();
+        }
+      });
+  
+      JMenuItem enableTweak = Toolkit.newJMenuItemShift("Tweak", 'T');
+      enableTweak.setSelected(ExperimentalMode.enableTweak);
+      enableTweak.addActionListener(new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+          ExperimentalMode.enableTweak = true;
+          handleRun();
+        }
+      });
+  
+      return buildSketchMenu(new JMenuItem[] {
+        runItem, presentItem, enableTweak, stopItem });
+    }
 
     /**
      * Callback for menu items. Implementation of Swing ActionListener.
@@ -1761,7 +1786,7 @@ public class DebugEditor extends JavaEditor implements ActionListener {
     /**
      * Show warnings menu item
      */
-    protected JCheckBoxMenuItem enableTweakCB;
+    //protected JCheckBoxMenuItem enableTweakCB;
 
 	String[] baseCode;
 
diff --git a/pdex/src/processing/mode/experimental/ExperimentalMode.java b/pdex/src/processing/mode/experimental/ExperimentalMode.java
index c87f73cd8..a4ca9d71a 100755
--- a/pdex/src/processing/mode/experimental/ExperimentalMode.java
+++ b/pdex/src/processing/mode/experimental/ExperimentalMode.java
@@ -178,8 +178,8 @@ public class ExperimentalMode extends JavaMode {
     defaultAutoSaveEnabled = Preferences.getBoolean(prefDefaultAutoSave);
     ccTriggerEnabled = Preferences.getBoolean(prefCCTriggerEnabled);
 
-    // TweakMode code
-    enableTweak = Preferences.getBoolean(prefEnableTweak);
+    // TweakMode code - not a sticky preference anymore
+    // enableTweak = Preferences.getBoolean(prefEnableTweak);
   }
 
   public void savePreferences() {
@@ -196,8 +196,8 @@ public class ExperimentalMode extends JavaMode {
     Preferences.setBoolean(prefDefaultAutoSave, defaultAutoSaveEnabled);
     Preferences.setBoolean(prefCCTriggerEnabled, ccTriggerEnabled);
 
-    // TweakMode code
-    Preferences.setBoolean(prefEnableTweak, enableTweak);
+    // TweakMode code - not a sticky preference anymore
+    // Preferences.setBoolean(prefEnableTweak, enableTweak);
   }
 
   public void ensurePrefsExist() {
@@ -225,10 +225,10 @@ public class ExperimentalMode extends JavaMode {
     if (Preferences.get(prefCCTriggerEnabled) == null)
       Preferences.setBoolean(prefCCTriggerEnabled, ccTriggerEnabled);
 
-    // TweakMode code
-    if (Preferences.get(prefEnableTweak) == null) {
-    	Preferences.setBoolean(prefEnableTweak, enableTweak);
-    }
+    // TweakMode code - not a sticky preference anymore
+//    if (Preferences.get(prefEnableTweak) == null) {
+//    	Preferences.setBoolean(prefEnableTweak, enableTweak);
+//    }
   }
 
 
@@ -343,6 +343,7 @@ public class ExperimentalMode extends JavaMode {
 	public Runner handleRun(Sketch sketch, RunnerListener listener) throws SketchException
 	{
 		if (enableTweak) {
+		  enableTweak = false;
 			return handleTweakPresentOrRun(sketch, listener, false);
 		}
 		else {
@@ -366,6 +367,7 @@ public class ExperimentalMode extends JavaMode {
 	public Runner handlePresent(Sketch sketch, RunnerListener listener) throws SketchException
 	{
 		if (enableTweak) {
+		  enableTweak = false;
 			return handleTweakPresentOrRun(sketch, listener, true);
 		}
 		else {