diff --git a/lib/OpenLayers/Control/PanZoom.js b/lib/OpenLayers/Control/PanZoom.js
index ea9f2c38ff..d69a4d7a40 100644
--- a/lib/OpenLayers/Control/PanZoom.js
+++ b/lib/OpenLayers/Control/PanZoom.js
@@ -113,5 +113,11 @@ OpenLayers.Control.PanZoom.prototype =
             case "zoomextents": this.map.zoomExtent(); break;
         }
         Event.stop(evt);
+    },
+    destroy: function() {
+        OpenLayers.Control.prototype.destroy.apply(this, arguments);
+        for(i=0; i<this.buttons.length; i++) {
+            this.buttons[i].map = null;
+        }
     }
 });