diff --git a/canvas.js b/canvas.js
index 3f38cfa..cbf571b 100644
--- a/canvas.js
+++ b/canvas.js
@@ -76,6 +76,12 @@ init: function (id, width, height, keyDown, keyUp, mouseDown, mouseUp) {
 
 clear: function () {
     Canvas.ctx.clearRect(0, 0, Canvas.c_wx, Canvas.c_wy);
+    var c = $(Canvas.id);
+    c.width = 640;
+    c.height = 20;
+},
+
+stop: function () {
     var c = $(Canvas.id);
     document.removeEvents('keydown');
     document.removeEvents('keyup');
@@ -85,9 +91,6 @@ clear: function () {
     /* Work around right and middle click browser behaviors */
     document.removeEvents('click');
     document.body.removeEvents('contextmenu');
-
-    c.width = 640;
-    c.height = 20;
 },
 
 draw: function () {
diff --git a/vnc.js b/vnc.js
index 2c59447..1f99126 100644
--- a/vnc.js
+++ b/vnc.js
@@ -772,7 +772,10 @@ disconnect: function () {
         RFB.ws.close();
     }
     if (Canvas.ctx) {
-        Canvas.clear();
+        Canvas.stop();
+        if (! /__debug__$/i.test(document.location.href)) {
+            Canvas.clear();
+        }
     }
     $('connectButton').value = "Connect";
     $('connectButton').onclick = RFB.connect;