diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 65a18269e..f9462e90a 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -432,8 +432,8 @@ public class Base {
 
   protected int[] nextEditorLocation() {
     Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
-    int defaultWidth = Preferences.getInteger("default.window.width");
-    int defaultHeight = Preferences.getInteger("default.window.height");
+    int defaultWidth = Preferences.getInteger("editor.window.width.default");
+    int defaultHeight = Preferences.getInteger("editor.window.height.default");
 
     if (activeEditor == null) {
       // If no current active editor, use default placement
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 9bd14199a..9c7cba09d 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -267,12 +267,12 @@ public class Editor extends JFrame implements RunnerListener {
     // minimums. Adapted by Chris Lonnen from comments here:
     // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4320050
     // as a fix for http://dev.processing.org/bugs/show_bug.cgi?id=25
-    final int minX = 400; //kind of arbitrary
-    final int minY = 450;
+    final int minW = Preferences.getInteger("editor.window.width.min");
+    final int minH = Preferences.getInteger("editor.window.height.min");
     addComponentListener(new java.awt.event.ComponentAdapter() {
         public void componentResized(ComponentEvent event) {
-          setSize((getWidth() < minX) ? minX : getWidth(),
-                  (getHeight() < minY) ? minY : getHeight());
+          setSize((getWidth() < minW) ? minW : getWidth(),
+                  (getHeight() < minH) ? minH : getHeight());
         }
       });
 
@@ -390,10 +390,10 @@ public class Editor extends JFrame implements RunnerListener {
    * This appears to only be required on OS X 10.2, and is not
    * even being called on later versions of OS X or Windows.
    */
-  public Dimension getMinimumSize() {
-    //System.out.println("getting minimum size");
-    return new Dimension(500, 550);
-  }
+//  public Dimension getMinimumSize() {
+//    //System.out.println("getting minimum size");
+//    return new Dimension(500, 550);
+//  }
 
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .