diff --git a/app/src/processing/app/ui/EditorState.java b/app/src/processing/app/ui/EditorState.java
index 1eeafba2d..762076bd2 100644
--- a/app/src/processing/app/ui/EditorState.java
+++ b/app/src/processing/app/ui/EditorState.java
@@ -161,6 +161,9 @@ public class EditorState {
     int defaultWidth = Preferences.getInteger("editor.window.width.default");
     int defaultHeight = Preferences.getInteger("editor.window.height.default");
 
+    defaultWidth = Math.min(defaultWidth, deviceBounds.width);
+    defaultHeight = Math.min(defaultHeight, deviceBounds.height);
+
     if (editors.size() == 0) {
       // If no current active editor, use default placement.
       // Center the window on ths screen, taking into account that the
@@ -242,4 +245,4 @@ public class EditorState {
 //    writer.print('\t');
 //    writer.print(rect.height);
 //  }
-}
\ No newline at end of file
+}
diff --git a/core/todo.txt b/core/todo.txt
index c48cc3bd8..3ae4456ac 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -3,6 +3,10 @@ X curveVertex() does not work with FX2D renderer
 X   https://github.com/processing/processing/issues/3960
 X hide menu bar on OS X when FX2D is running full screen
 X add quotes to the necessary parameters in the size() error messages
+X Editor menu is outside the visible screen with 800x480 display
+X   https://github.com/processing/processing/issues/3913
+X   https://github.com/processing/processing/pull/3999
+X   https://github.com/processing/processing/pull/3992
 _ when calling exit(), if sketch has halted w/ exception, force the quit
 _   otherwise have to double-quit with cmd-q on OS X
 _   simple test case: using size() inside setup() from Eclipse