diff --git a/app/src/processing/app/EditorHeader.java b/app/src/processing/app/EditorHeader.java
index ee25b6a2f..32597b2c9 100644
--- a/app/src/processing/app/EditorHeader.java
+++ b/app/src/processing/app/EditorHeader.java
@@ -110,6 +110,10 @@ public class EditorHeader extends JComponent {
       Keys.bind(EditorHeader.this, newTab);
       Keys.bind(EditorHeader.this, prevTab);
       Keys.bind(EditorHeader.this, nextTab);
+
+      // Add alternative keybindings to switch tabs
+      Keys.bind(EditorHeader.this, prevTab, Keys.ctrlShift(KeyEvent.VK_TAB));
+      Keys.bind(EditorHeader.this, nextTab, Keys.ctrl(KeyEvent.VK_TAB));
     }
   }
   public Actions actions = new Actions();
diff --git a/app/src/processing/app/EditorListener.java b/app/src/processing/app/EditorListener.java
index 511578812..e5203b468 100644
--- a/app/src/processing/app/EditorListener.java
+++ b/app/src/processing/app/EditorListener.java
@@ -34,31 +34,6 @@ public class EditorListener implements KeyListener {
 
   @Override
   public void keyPressed(KeyEvent event) {
-
-    SketchTextArea textarea = editor.getTextArea();
-    
-    if (!textarea.isEditable()) return;
-    
-    Sketch sketch = editor.getSketch();
-
-    int code = event.getKeyCode();
-    
-    // Navigation..
-    if ((event.getModifiers() & CTRL) == CTRL && code == KeyEvent.VK_TAB) {
-      sketch.handleNextCode();
-    }
-
-    // Navigation..
-    // FIXME: not working on LINUX !!!
-    if ((event.getModifiers() & CTRL_SHIFT) == CTRL_SHIFT && code == KeyEvent.VK_TAB) {
-        sketch.handlePrevCode();
-    }
-    
-//    if (event.isAltDown() && code == KeyEvent.VK_T) {
-//      int line = textarea.getCaretLineNumber();
-//      textarea.setActiveLineRange(line, line + 3); 
-//    }
-    
   }
 
   @Override