diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 4ee363ab5..9e2a74c31 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -9716,7 +9716,8 @@ public class PApplet implements PConstants {
     g = createPrimaryGraphics();
     surface = g.createSurface();
 
-    if (g.displayable()) {
+    // if the PSurface calls setFrame() no need to create a fake frame
+    if (g.displayable() && frame == null) {
       frame = new Frame() {
         @Override
         public void setResizable(boolean resizable) {
diff --git a/core/src/processing/core/PSurfaceAWT.java b/core/src/processing/core/PSurfaceAWT.java
index 4abe5f515..aa7732d05 100644
--- a/core/src/processing/core/PSurfaceAWT.java
+++ b/core/src/processing/core/PSurfaceAWT.java
@@ -517,7 +517,7 @@ public class PSurfaceAWT extends PSurfaceNone {
     // http://code.google.com/p/processing/issues/detail?id=467
     frame.setResizable(false);
 
-//    return frame;
+    sketch.setFrame(frame);
   }
 
 
diff --git a/core/todo.txt b/core/todo.txt
index 561725416..0d3a249c6 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -1,5 +1,5 @@
 0237 (3.0a10)
-
+X retain original java.awt.Frame when it's in use
 
 fixed earlier/can no longer reproduce
 X strips when rendering spheres with lights and anti-aliasing