Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 13055)
+++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java	(revision 13056)
@@ -546,4 +546,5 @@
         // Construct the list of loaded GPX tracks
         Collection<Layer> layerLst = MainApplication.getLayerManager().getLayers();
+        gpxLst.clear();
         GpxDataWrapper defaultItem = null;
         for (Layer cur : layerLst) {
@@ -574,4 +575,12 @@
         if (defaultItem != null) {
             cbGpx.setSelectedItem(defaultItem);
+        } else {
+            // select first GPX track associated to a file
+            for (GpxDataWrapper item : gpxLst) {
+                if (item.file != null) {
+                    cbGpx.setSelectedItem(item);
+                    break;
+                }
+            }
         }
         cbGpx.addActionListener(statusBarUpdaterWithRepaint);