diff --git a/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwing.java b/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwing.java
index 3aa206d..31eecad 100644
--- a/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwing.java
+++ b/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwing.java
@@ -651,7 +651,9 @@
             canvas.removePSwing(this);
         }
 
-        if (newCanvas != null) {
+        if (newCanvas == null) {
+        	canvas = null;
+        } else {
             canvas = newCanvas;
             canvas.addPSwing(this);
             updateBounds();