Index: trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 18482)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 18483)
@@ -215,5 +215,5 @@
      */
     public void selectionChanged() {
-        if (noteData == null || noteData.getSelectedNote() == null) {
+        if (noteData == null || noteData.getSelectedNote() == null || displayList.getModel().getSize() == 0) {
             displayList.clearSelection();
         } else {