Index: /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(revision 7819)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(revision 7820)
@@ -50,5 +50,4 @@
         super(name);
         noteData = new NoteData(notes);
-        init();
     }
 
@@ -57,11 +56,9 @@
         super(tr("Notes"));
         noteData = new NoteData();
-        init();
-    }
-
-    private void init() {
-        if (Main.map != null && Main.map.mapView != null) {
-            Main.map.mapView.addMouseListener(this);
-        }
+    }
+
+    @Override
+    public void hookUpMapView() {
+        Main.map.mapView.addMouseListener(this);
     }