Index: applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java
===================================================================
--- applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java	(revision 19050)
+++ applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java	(revision 19074)
@@ -23,4 +23,5 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
@@ -69,5 +70,5 @@
 		clearTileStorage();
 
-	    Layer.addLayerChangeListener(new LayerChangeListener() {
+	    MapView.addLayerChangeListener(new LayerChangeListener() {
 	        public void activeLayerChange(Layer oldLayer, Layer newLayer) {
 	        	// if user changes to a walking papers layer, zoom there just as if
@@ -86,5 +87,7 @@
 
 	        public void layerRemoved(Layer oldLayer) {
-	        	//
+	        	if (oldLayer == WalkingPapersLayer.this) {
+	        		MapView.removeLayerChangeListener(this);
+	        	}
 	        }
 	    });