Index: src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java	(revision 17878)
+++ src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java	(working copy)
@@ -343,10 +343,10 @@
                         .getValue();
 
                 if (result == 2) {
-                    currentData.removeSelectedImages();
                     for (ImageEntry delete : toDelete) {
                         if (Utils.deleteFile(delete.getFile())) {
                             Logging.info("File " + delete.getFile() + " deleted.");
+                            currentData.removeSelectedImages();
                         } else {
                             JOptionPane.showMessageDialog(
                                     MainApplication.getMainFrame(),