diff --git a/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java b/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
index 3dedcdfd1b..cf5ddb9f3c 100644
a
|
b
|
public class NotesDialog extends ToggleDialog implements LayerChangeListener, No
|
407 | 407 | if (note != null) { |
408 | 408 | int selectedIndex = displayList.getSelectedIndex(); |
409 | 409 | noteData.closeNote(note, dialog.getInputText()); |
410 | | noteData.setSelectedNote(model.getElementAt(selectedIndex)); |
| 410 | // This is required since filtering may cause the model |
| 411 | if (model.getSize() > 0) { |
| 412 | noteData.setSelectedNote(model.getElementAt(selectedIndex)); |
| 413 | } else { |
| 414 | noteData.setSelectedNote(null); |
| 415 | } |
411 | 416 | } |
412 | 417 | } |
413 | 418 | } |