diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 5251b7361..e48c5caee 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -2796,7 +2796,7 @@ public class PApplet extends Applet
       // Ctrl-W (or Cmd-W) events by closing the sketch. Disable this behavior
       // when running independently, because this sketch may be one component
       // embedded inside an application that has its own close behavior.
-      if (external &&
+      if (external && event.getNative() instanceof java.awt.event.KeyEvent &&
           ((java.awt.event.KeyEvent) event.getNative()).getModifiers() ==
             Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() &&
           event.getKeyCode() == 'W') {
@@ -10448,7 +10448,7 @@ public class PApplet extends Applet
    * Description to come...
    *
    * ( end auto-generated from textureWrap.xml )
-   *
+   * 
    * @webref image:textures
    * @param wrap Either CLAMP (default) or REPEAT
    */
@@ -10617,7 +10617,7 @@ public class PApplet extends Applet
    * This is a new reference entry for Processing 2.0. It will be updated shortly.
    *
    * ( end auto-generated )
-   *
+   * 
    * @webref Rendering
    * @param mode the blending mode to use
    */
@@ -10661,7 +10661,7 @@ public class PApplet extends Applet
    * This is a new reference entry for Processing 2.0. It will be updated shortly.
    *
    * ( end auto-generated )
-   *
+   * 
    * @webref rendering:shaders
    * @param fragFilename name of fragment shader file
    */
@@ -10684,7 +10684,7 @@ public class PApplet extends Applet
    * This is a new reference entry for Processing 2.0. It will be updated shortly.
    *
    * ( end auto-generated )
-   *
+   * 
    * @webref rendering:shaders
    * @param shader name of shader file
    */
@@ -10709,7 +10709,7 @@ public class PApplet extends Applet
    * This is a new reference entry for Processing 2.0. It will be updated shortly.
    *
    * ( end auto-generated )
-   *
+   * 
    * @webref rendering:shaders
    */
   public void resetShader() {
@@ -11590,9 +11590,9 @@ public class PApplet extends Applet
 
 
   /**
-   *
+   * 
    * @param level either 2, 4, or 8
-   */
+   */ 
   public void smooth(int level) {
     if (recorder != null) recorder.smooth(level);
     g.smooth(level);