diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 5650181d1..52a1c48af 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -222,14 +222,15 @@ public abstract class Editor extends JFrame implements RunnerListener {
     // Bring back the general options for the editor
     applyPreferences();
     
-    // Recommendation, but doesn't seem to do much for us
-    // http://download.oracle.com/javase/tutorial/uiswing/misc/focus.html
     // Make textField get the focus whenever frame is activated.
-//    addWindowFocusListener(new WindowAdapter() {
-//        public void windowGainedFocus(WindowEvent e) {
-//            textarea.requestFocusInWindow();
-//        }
-//    });
+    // http://download.oracle.com/javase/tutorial/uiswing/misc/focus.html
+    // May not be necessary, but helps avoid random situations with 
+    // the editor not being able to request its own focus.
+    addWindowFocusListener(new WindowAdapter() {
+        public void windowGainedFocus(WindowEvent e) {
+            textarea.requestFocusInWindow();
+        }
+    });
 
     // Open the document that was passed in
     boolean loaded = handleOpenInternal(path);
diff --git a/app/src/processing/app/EditorStatus.java b/app/src/processing/app/EditorStatus.java
index 502659a1a..c2986dc6c 100644
--- a/app/src/processing/app/EditorStatus.java
+++ b/app/src/processing/app/EditorStatus.java
@@ -134,7 +134,7 @@ public class EditorStatus extends JPanel {
     editField.setVisible(true);
     editField.setText(dflt);
     editField.selectAll();
-    editField.requestFocus();
+    editField.requestFocusInWindow();
 
     repaint();
   }
@@ -144,6 +144,7 @@ public class EditorStatus extends JPanel {
     okButton.setVisible(false);
     cancelButton.setVisible(false);
     editField.setVisible(false);
+    editor.textarea.requestFocusInWindow();
     empty();
   }