Index: src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 8077)
+++ src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(working copy)
@@ -313,7 +313,9 @@
                 Main.debug("User aborted note reopening");
                 return;
             }
+            int selectedIndex = displayList.getSelectedIndex();
             noteData.addCommentToNote(note, dialog.getInputText());
+            noteData.setSelectedNote(model.getElementAt(selectedIndex));
         }
     }
 
@@ -334,7 +336,9 @@
                 return;
             }
             Note note = displayList.getSelectedValue();
+            int selectedIndex = displayList.getSelectedIndex();
             noteData.closeNote(note, dialog.getInputText());
+            noteData.setSelectedNote(model.getElementAt(selectedIndex));
         }
     }
 
@@ -373,7 +377,9 @@
             }
 
             Note note = displayList.getSelectedValue();
+            int selectedIndex = displayList.getSelectedIndex();
             noteData.reOpenNote(note, dialog.getInputText());
+            noteData.setSelectedNote(model.getElementAt(selectedIndex));
         }
     }