diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
index c2b7c4bda..e8cf184e8 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
@@ -157,7 +157,9 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode
                     yLayer.discardTmp();
                     yLayer.updateBufferAndRepaint();
                 }
-                removeSupportLayer();
+                if (Config.getPref().getBoolean("geoimage.supportlayer.delete_on_close", false)) {
+                    removeSupportLayer();
+                    }
                 break;
             case AGAIN:
                 actionPerformed(null);
@@ -191,7 +193,9 @@ public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode
 
                 yLayer.applyTmp();
                 yLayer.updateBufferAndRepaint();
+                if (Config.getPref().getBoolean("geoimage.supportlayer.delete_on_close", false)) {
                 removeSupportLayer();
+                }
 
                 break;
             default: