diff --git a/app/src/processing/app/EditorHeader.java b/app/src/processing/app/EditorHeader.java
index f7c092d64..89044983e 100644
--- a/app/src/processing/app/EditorHeader.java
+++ b/app/src/processing/app/EditorHeader.java
@@ -568,12 +568,13 @@ public class EditorHeader extends JComponent {
     menu.addSeparator();
 
     //  KeyEvent.VK_LEFT and VK_RIGHT will make Windows beep
-    item = Toolkit.newJMenuItemShift(Language.text("editor.header.previous_tab"), KeyEvent.VK_LEFT);
+    item = Toolkit.newJMenuItemAlt(Language.text("editor.header.previous_tab"), KeyEvent.VK_LEFT);
     action = new AbstractAction() {
       @Override
       public void actionPerformed(ActionEvent e) {
-        Sketch sketch = editor.getSketch();
-        sketch.setCurrentCode(sketch.getCurrentCodeIndex() - 1);
+//        Sketch sketch = editor.getSketch();
+//        sketch.setCurrentCode(sketch.getCurrentCodeIndex() - 1);
+        editor.getSketch().handlePrevCode();
       }
     };
     mapKey = "editor.header.previous_tab";
@@ -583,12 +584,13 @@ public class EditorHeader extends JComponent {
     item.addActionListener(action);
     menu.add(item);
 
-    item = Toolkit.newJMenuItemShift(Language.text("editor.header.next_tab"), KeyEvent.VK_RIGHT);
+    item = Toolkit.newJMenuItemAlt(Language.text("editor.header.next_tab"), KeyEvent.VK_RIGHT);
     action = new AbstractAction() {
       @Override
       public void actionPerformed(ActionEvent e) {
-        Sketch sketch = editor.getSketch();
-        sketch.setCurrentCode(sketch.getCurrentCodeIndex() + 1);
+//        Sketch sketch = editor.getSketch();
+//        sketch.setCurrentCode(sketch.getCurrentCodeIndex() + 1);
+        editor.getSketch().handleNextCode();
       }
     };
     mapKey = "editor.header.next_tab";
@@ -603,10 +605,10 @@ public class EditorHeader extends JComponent {
       menu.addSeparator();
 
       ActionListener jumpListener = new ActionListener() {
-          public void actionPerformed(ActionEvent e) {
-            editor.getSketch().setCurrentCode(e.getActionCommand());
-          }
-        };
+        public void actionPerformed(ActionEvent e) {
+          editor.getSketch().setCurrentCode(e.getActionCommand());
+        }
+      };
       for (SketchCode code : sketch.getCode()) {
         item = new JMenuItem(code.getPrettyName());
         item.addActionListener(jumpListener);
diff --git a/app/src/processing/mode/java/PdeKeyListener.java b/app/src/processing/mode/java/PdeKeyListener.java
index ec4655507..a286fd8ca 100644
--- a/app/src/processing/mode/java/PdeKeyListener.java
+++ b/app/src/processing/mode/java/PdeKeyListener.java
@@ -80,6 +80,7 @@ public class PdeKeyListener {
 
     Sketch sketch = editor.getSketch();
 
+    /*
     if ((event.getModifiers() & CTRL_ALT) == CTRL_ALT) {
       if (code == KeyEvent.VK_LEFT) {
         sketch.handlePrevCode();
@@ -89,6 +90,7 @@ public class PdeKeyListener {
         return true;
       }
     }
+    */
 
     if ((event.getModifiers() & InputEvent.META_MASK) != 0) {
       //event.consume();  // does nothing