diff --git a/app/.classpath b/app/.classpath
index 00411841a..e12f72e7e 100644
--- a/app/.classpath
+++ b/app/.classpath
@@ -6,6 +6,7 @@
 			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry kind="lib" path="lib/antlr.jar" sourcepath="lib/antlr-src.zip"/>
 	<classpathentry kind="lib" path="lib/jna.jar"/>
@@ -18,6 +19,5 @@
 	<classpathentry kind="lib" path="lib/jdi.jar" sourcepath="/processing-experimental/mode/jdi-src.zip"/>
 	<classpathentry kind="lib" path="lib/jdimodel.jar" sourcepath="/processing-experimental/mode/jdimodel-src.zip"/>
 	<classpathentry kind="lib" path="lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/src/processing/core/PSurfaceAWT.java b/core/src/processing/core/PSurfaceAWT.java
index c5c6c0c23..35c405b07 100644
--- a/core/src/processing/core/PSurfaceAWT.java
+++ b/core/src/processing/core/PSurfaceAWT.java
@@ -831,9 +831,10 @@ public class PSurfaceAWT implements PSurface {
 
 //    canvas.setSize(wide, high);
 //    frame.setSize(wide, high);
-    setFrameSize(); //wide, high);
+    if (frame != null) {  // canvas only
+      setFrameSize(); //wide, high);
+    }
     setCanvasSize();
-    frame.setLocationRelativeTo(null);
 //    if (frame != null) {
 //      frame.setLocationRelativeTo(null);
 //    }