diff --git a/app/src/processing/app/syntax/JEditTextArea.java b/app/src/processing/app/syntax/JEditTextArea.java
index ca86a96cb..c9a1c43cc 100644
--- a/app/src/processing/app/syntax/JEditTextArea.java
+++ b/app/src/processing/app/syntax/JEditTextArea.java
@@ -103,6 +103,9 @@ public class JEditTextArea extends JComponent
     painter.addMouseListener(new MouseHandler());
     painter.addMouseMotionListener(new DragHandler());
     addFocusListener(new FocusHandler());
+    // send tab keys through to the text area
+    // http://dev.processing.org/bugs/show_bug.cgi?id=1267
+    setFocusTraversalKeysEnabled(false);
 
     // Load the defaults
     setInputHandler(defaults.inputHandler);
@@ -1028,8 +1031,8 @@ public class JEditTextArea extends JComponent
   {
     select(selectionStart,selectionEnd);
   }
-  
-  
+
+
   public final boolean isSelectionActive()
   {
     return(selectionStart != selectionEnd);
diff --git a/todo.txt b/todo.txt
index dc7dfc3ae..e07b47875 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,7 +1,6 @@
 0167 pde (1.0.5?)
-
-_ fix tab key and focus issue in the editor
-_   http://dev.processing.org/bugs/show_bug.cgi?id=1267
+X fix tab key and focus issue in the editor
+X   http://dev.processing.org/bugs/show_bug.cgi?id=1267
 
 _ duplicate entries for sketchbook in the file menu
 _   http://dev.processing.org/bugs/show_bug.cgi?id=1260