Index: /trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java	(revision 17413)
+++ /trunk/src/org/openstreetmap/josm/actions/UploadNotesAction.java	(revision 17414)
@@ -23,4 +23,5 @@
     /** Create a new action to upload notes */
     public UploadNotesAction() {
+        super(false);
         putValue(SHORT_DESCRIPTION, tr("Upload note changes to server"));
         putValue(NAME, tr("Upload notes"));
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java	(revision 17413)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java	(revision 17414)
@@ -98,3 +98,13 @@
         // Do nothing
     }
+
+    @Override
+    protected boolean listenToLayerChange() {
+        return false;
+    }
+
+    @Override
+    protected boolean listenToSelectionChange() {
+        return false;
+    }
 }